gettext-0.19.8.1HEADgettext-0.19.8.1master

2673 files changed, 26352 insertions, 22641 deletions

diff --git a/.tarball-version b/.tarball-version
index 082b435..078f280 100644
--- a/.tarball-version
+++ b/.tarball-version
@@ -1 +1 @@
-0.19.7
+0.19.8.1
diff --git a/.version b/.version
index 082b435..078f280 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.19.7
+0.19.8.1
diff --git a/ChangeLog b/ChangeLog
index cd0dd99..563acd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,406 @@
+2016-06-11  Daiki Ueno  <ueno@gnu.org>
+
+	build: Fix unintentional soname bump
+	* gettext-runtime/intl/Makefile.in: Revert LTV_CURRENT and increment
+	LTV_REVISION.
+	* gettext-tools/libgettextpo/Makefile.am: Likewise.
+
+2016-06-09  Daiki Ueno  <ueno@gnu.org>
+
+	Update translations
+	* gettext-runtime/po/eo.po: Update from Felipe Castro <fefcas@gmail.com>
+	* gettext-runtime/po/hr.po: Update from Božidar Putanec <bozidarp@yahoo.com>
+	* gettext-runtime/po/sv.po: Update from Göran Uddeborg <goeran@uddeborg.se>
+	* gettext-tools/examples/po/eo.po: Update from Felipe Castro <fefcas@gmail.com>
+	* gettext-tools/examples/po/hr.po: Update from Božidar Putanec <bozidarp@yahoo.com>
+	* gettext-tools/examples/po/sv.po: Update from Göran Uddeborg <goeran@uddeborg.se>
+	* gettext-tools/po/bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>
+	* gettext-tools/po/es.po: Update from Antonio Ceballos <aceballos@gmail.com>
+	* gettext-tools/po/fr.po: Update from Stéphane Aulery <lkppo@free.fr>
+	* gettext-tools/po/ja.po: Update from Masahito Yamaga <ma@yama-ga.com>
+	* gettext-tools/po/ko.po: Update from Changwoo Ryu <cwryu@debian.org>
+	* gettext-tools/po/nl.po: Update from Benno Schulenberg <benno@vertaalt.nl>
+	* gettext-tools/po/pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>
+	* gettext-tools/po/sk.po: Update from Marcel Telka <marcel@telka.sk>
+	* gettext-tools/po/sr.po: Update from Миро�лав �иколић <miroslavnikolic@rocketmail.com>
+	* gettext-tools/po/sv.po: Update from Göran Uddeborg <goeran@uddeborg.se>
+	* gettext-tools/po/tr.po: Update from Nilgün Belma Bugüner <nilgun@buguner.name.tr>
+	* gettext-tools/po/uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>
+	* gettext-tools/po/vi.po: Update from Trần Ng�c Quân <vnwildman@gmail.com>
+
+	Update matrix
+
+	NEWS: Fix release date of 0.19.8
+
+	Prepare for 0.19.8
+
+	THANKS: Update
+
+2016-06-08  Daiki Ueno  <ueno@gnu.org>
+
+	gnulib-local: Work around regcomp.c compile error
+	* gnulib-local/Makefile.am (EXTRA_DIST): Add lib/regcomp.c.diff.
+	* gnulib-local/lib/regcomp.c.diff: New file, partially revert Gnulib
+	commit f97745b0.
+
+	tests: Use Exit instead of exit if init.sh is used
+	* gettext-tools/tests/*: Use Exit instead of exit, as suggested by
+	init.sh.
+
+2016-06-07  Daiki Ueno  <ueno@gnu.org>
+
+	build: Create intl/ChangeLog
+	* autogen.sh: Create an empty ChangeLog for gettext-runtime/intl, which
+	is necessary when running "make dist" from the top level directory.
+
+2016-06-02  Daiki Ueno  <ueno@gnu.org>
+
+	build: Simplify placeholder ChangeLog creation
+	* autogen.sh: Use empty ChangeLog for placeholder.  Bail out if any
+	error occurs in autoreconf phase.
+
+	maint: Update release steps
+
+2016-06-01  Daiki Ueno  <ueno@gnu.org>
+
+	tests: Check invalid input in sentence-1-prg
+	* gettext-tools/tests/sentence-1-prg.c (main): Check input buffer
+	overflow, while it is not possible with the current test case.
+
+	tests: Fix test data for sentence-1
+	* gettext-tools/tests/sentence-1: Use NO-BREAK SPACE instead of
+	IDEOGRAPHIC SPACE.
+
+2016-05-31  Daiki Ueno  <ueno@gnu.org>
+
+	tests: Fix location of valgrind suppression file
+	* gettext-tools/tests/Makefile.am (CHECKER): Use $(abs_srcdir) instead
+	of $(srcdir).
+
+	tests: Turn sentence test into a shell script
+	For consistency with other tests.  Also it fixes a test failure when
+	built with --disable-shared, since LOG_COMPILER set to $(SHELL) doesn't
+	recognize binary executable.
+	* gettext-tools/tests/Makefile.am (TESTS): Rename 'sentence' to
+	'sentence-1'.
+	(check_PROGRAMS): Rename 'sentence' to 'sentence-1-prg'.
+	(sentence_1_prg_SOURCES): Rename from 'sentence_SOURCES'.
+	(sentence_1_prg_CPPFLAGS): Rename from 'sentence_CPPFLAGS'.
+	(sentence_1_prg_LDADD): Rename from 'sentence_LDADD'.
+	* gettext-tools/tests/sentence-1: New file.
+	* gettext-tools/tests/sentence-1-prg.c: Rename from sentence.c, move the
+	test data to sentence-1.
+	* gettext-tools/tests/.gitignore: Ignore sentence-1-prg.
+
+2016-05-30  Daiki Ueno  <ueno@gnu.org>
+
+	maint: Update copyright year
+
+	xgettext: Update usage documentation
+	* gettext-tools/src/xgettext.c (usage): Mention 'bullet-unicode' check.
+
+2016-05-28  Daniel Burr  <dburr@dburr.net>  (tiny change)
+
+	build: Make libxml2 check tighter
+	* gnulib-local/m4/libxml.m4 (gl_LIBXML): Try to check
+	xmlXPathSetContextNode, which is available in libxml2 2.9.1 or later.
+	Problem reported by Dominyk in:
+	http://savannah.gnu.org/bugs/?46844
+
+2016-05-27  Daiki Ueno  <ueno@gnu.org>
+
+	desktop: Add missing "extern" in header
+	* gettext-tools/src/read-desktop.h: Add "extern" to each function
+	declaration.
+	Possibly related to: https://savannah.gnu.org/bugs/?45896
+
+	NEWS: Mention gettext.m4 change
+
+	m4: Rely less on internal symbols
+	* gettext-runtime/m4/gettext.m4 (AM_GNU_GETTEXT): Skip checks for the
+	internal symbols _nl_msg_cat_cntr, _nl_domain_bindings, and
+	_nl_expand_alias, if __GNU_GETTEXT_SUPPORTED_REVISION is defined.
+	Problem reported and fix suggested by Masanori Ogino in:
+	https://lists.gnu.org/archive/html/bug-gettext/2016-04/msg00000.html
+	The rationale behind this is: (1) those symbol checks are for detecting
+	certain broken implementations, namely NetBSD and Solaris 7, and
+	(2) __GNU_GETTEXT_SUPPORTED_REVISION is not defined in those
+	implementations, while it is defined on compatible implementations, such
+	as musl-libc which doesn't have those internal symbols.
+
+2016-05-25  Daiki Ueno  <ueno@gnu.org>
+
+	NEWS: Add 0.19.8 changes
+
+	intl: Pacify pre-C99 compilers
+	* gettext-runtime/intl/plural-exp.h (HAVE_STRUCT_INITIALIZER): New
+	macro, based on the check previously in plural-exp.c.  Also add check
+	for __SUNPRO_C for Solaris Studio C compiler.
+	(GERMANIC_PLURAL): Define as 'struct expression' not 'const struct
+	expression' if struct/union initializers are not supported by the
+	compiler.
+	* gettext-runtime/intl/plural-exp.c: Use HAVE_STRUCT_INITIALIZER.
+	Reported by Dagobert Michelsen and investigated by pan7 in:
+	https://savannah.gnu.org/support/?108743
+
+2016-05-24  David Shea  <dshea@redhat.com>
+
+	desktop: Fix invalid memory access
+	* gettext-tools/src/read-desktop.c (desktop_lex): Don't access memory
+	deallocated with realloc().  Reported in:
+	http://savannah.gnu.org/bugs/?47991
+
+2016-05-23  Daiki Ueno  <ueno@gnu.org>
+
+	tests: Add more tests for JavaScript format string
+	* gettext-tools/tests/format-javascript-1: Add test for multiple uses of
+	same argument.
+	* gettext-tools/tests/format-javascript-2: Use proper flag to activate
+	javascript format checker.
+
+	javascript: Fix format type compatibility check
+	* gettext-tools/src/format-javascript.c (format_check): Check if the two
+	argument types are the same.
+
+2016-05-20  Daiki Ueno  <ueno@gnu.org>
+
+	tests: Add test for ITS search path
+	* gettext-tools/tests/Makefile.am (TESTS): Add new test.
+	* gettext-tools/tests/xgettext-its-2: New file.
+
+	search-path: Fix XDG_DATA_DIRS traversal
+	* gettext-tools/src/search-path.c (foreach_elements): Append "gettext"
+	suffix to each element from XDG_DATA_DIRS.
+
+	search-path: Don't relocate dirs given as envvar
+	* gettext-tools/src/search-path.c (foreach_function_ty): New typedef.
+	(path_array_ty): New struct.
+	(foreach_components, increment, fill): New functions.
+	(get_search_path): Rewrite using those functions.  Relocate
+	GETTEXTDATADIR here.
+	* gettext-tools/src/search-path.h (get_search_path): Update documentation.
+	* gettext-tools/src/msgfmt.c (main): Don't relocate directories in ITS
+	search path.
+	* gettext-tools/src/xgettext.c (main): Likewise.
+
+2016-05-19  Daiki Ueno  <ueno@gnu.org>
+
+	Update after Gnulib changed
+	* gnulib-local/lib/gettext.h: Update from gnulib.
+	* gettext-runtime/m4/extern-inline.m4: Likewise.
+	* gettext-runtime/m4/intdiv0.m4: Likewise.
+
+	Update gnulib
+	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Explicitly pull 'gettext',
+	as the module is now marked as obsolete.
+	* gnulib-local/Makefile.am (EXTRA_DIST): Remove m4/hard-locale.m4.diff.
+	* gnulib-local/m4/hard-locale.m4.diff: Remove, as it is no longer
+	needed.
+	* gettext-tools/gnulib-lib/.gitignore: Ignore files brought by gnulib-tool.
+	* gettext-tools/gnulib-tests/.gitignore: Likewise.
+	* gettext-tools/libgettextpo/.gitignore: Likewise.
+
+2016-05-18  Daiki Ueno  <ueno@gnu.org>
+
+	maint: Add --no-git option to autogen.sh
+	* autogen.sh: Port --no-git option from Gnulib's bootstrap.
+
+2016-05-16  Daiki Ueno  <ueno@gnu.org>
+
+	msgfmt, xgettext: Respect XDG_DATA_DIRS
+	Suggested in https://savannah.gnu.org/bugs/?47123
+	* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Add 'xmemdup0'.
+	* gettext-tools/gnulib-lib/.gitignore: Ignore files brought by gnulib-tool.
+	* gettext-tools/gnulib-tests/.gitignore: Likewise.
+	* gettext-tools/src/search-path.c: New file.
+	* gettext-tools/src/search-path.h: New file.
+	* gettext-tools/src/Makefile.am (noinst_HEADERS): Add search-path.h.
+	(libgettextsrc_la_SOURCES): Add search-path.c.
+	* gettext-tools/src/msgfmt.c: Include "search-path.h".
+	(main): Use get_search_path to locate ITS directories.
+	* gettext-tools/src/xgettext.c: Include "search-path.h".
+	(main): Use get_search_path to locate ITS directories.
+
+	javascript: Avoid uninitialized variable
+	* gettext-tools/src/format-javascript.c (format_check): Fix
+	loop initialization.  Spotted by clang-analyzer.
+
+2016-03-26  Hanno Boeck  <hanno@gentoo.org>  (tiny change)
+
+	lua: Avoid heap buffer overflow
+	* gettext-tools/src/x-lua.c (string_end): Allocate a room for
+	terminating NUL.  Reported in: http://savannah.gnu.org/bugs/?4753
+
+2016-03-23  Daiki Ueno  <ueno@gnu.org>
+
+	format-python-brace: Support chained expression
+	* gettext-tools/src/format-python-brace.c (parse_directive): Recognize
+	chained getattr/getitem expressions.
+	* gettext-tools/tests/format-python-brace-1: Add test for the case where
+	both getattr and getitem are used.
+	Reported by Paul Franklin in:
+	https://lists.gnu.org/archive/html/bug-gettext/2016-03/msg00017.html
+
+	doc: Fix ngettext usage example
+	* gettext-tools/doc/gettext.texi (Plural forms): Fix positional argument
+	syntax in the C example.  Reported by Jonathan Leffler in:
+	http://lists.gnu.org/archive/html/bug-gettext/2016-03/msg00002.html
+
+2016-03-22  Daiki Ueno  <ueno@gnu.org>
+
+	javascript: Fix invalid memory access
+	* gettext-tools/src/format-javascript.c (format_parse): Fix numbered_arg
+	allocation for the unnumbered case.
+
+	Reported by Roger Mc Murtrie in: <http://savannah.gnu.org/bugs/?47492>.
+
+2016-03-22  Daiki Ueno  <ueno@gnu.org>
+
+	maint: Clean up .gitignore
+	* gettext-tools/gnulib-lib/.gitignore: Sort lines.
+
+2016-03-02  Daiki Ueno  <ueno@gnu.org>
+
+	xgettext: Put --its help in the right section
+	* gettext-tools/src/xgettext.c (usage): Move --its=FILE option under
+	"Language specific options" from "Output details".
+
+2016-02-22  Daiki Ueno  <ueno@gnu.org>
+
+	xgettext: Add new check bullet-unicode
+	* gettext-tools/src/xgettext.c (main): Generalize --check option
+	handling.
+	* gettext-tools/src/message.h (enum syntax_check_type): New enum value
+	sc_bullet_unicode.
+	(NSYNTAXCHECKS): Increment.
+	* gettext-tools/src/message.c (syntax_check_name): Add name for
+	sc_bullet_unicode.
+	* gettext-tools/src/msgl-check.c (struct bullet_ty, struct
+	bullet_stack_ty): New struct.
+	(bullet_stack): New variable.
+	(syntax_check_bullet_unicode): New function.
+	(sc_funcs): Register syntax_check_bullet_unicode as a check function for
+	sc_bullet_unicode.
+	* gettext-tools/tests/xgettext-14: Add tests for --check=bullet-unicode
+
+2016-02-10  Daiki Ueno  <ueno@gnu.org>
+
+	doc: Mention the behavior stripping *.in
+	* gettext-tools/doc/gettext.texi (Preparing ITS Rules): Add footnote
+	explaining the matching behavior if the input file name has the .in
+	suffix.  Suggested by Jan Synacek.
+
+2016-02-08  Daiki Ueno  <ueno@gnu.org>
+
+	javascript: Support '%m$' in format strings
+	Gjs has had support for numbered arguments in format strings since 1.40.
+	Recognize it as well in format-javascript, so msgfmt -c doesn't fail
+	when numbered arguments are in msgstr.  Reported by Sean Burke in:
+	https://lists.gnu.org/archive/html/bug-gettext/2015-10/msg00002.html
+	* gettext-tools/src/format-javascript.c (struct numbered_arg): New
+	struct.
+	(struct spec): Rename format_args_count to numbered_arg_count.  Add
+	NUMBERED field in place of FORMAT_ARGS.  All callers changed.
+	(numbered_arg_compare): New function.
+	(format_parse): Handle numbered arguments.  Based on format-awk.c.
+	(format_check): Add check for numbered arguments.
+	* gettext-tools/tests/format-javascript-1: Add tests for numbered
+	arguments.
+	* gettext-tools/tests/lang-javascript: Use numbered argument in format
+	strings.  Add check for Gjs version >= 1.40.
+
+	moopp: Revert file modes accidentally set
+
+2016-01-20  KO Myung-Hun  <komh78@gmail.com>
+
+	gettext-tools: Use a short name for DLLs on OS/2
+	OS/2 does not support a DLL name longer than 8 characters.
+
+	* gettext-tools/configure.ac (OS2): Define on OS/2.
+	* gettext-tools/gnulib-lib/Makefile.am (libgettextlib_la_LDFLAGS):
+	Set a DLL name to gtlib on OS/2.
+	* gettext-tools/libgettextpo/Makefile.am (libgettextpo_la_LDFLAGS):
+	Set a DLL name to gtpo on OS/2.
+	* gettext-tools/src/Makefile.am (libgettextsrc_la_LDFLAGS): Set a DLL
+	name to gtsrc on OS/2.
+
+2016-01-20  KO Myung-Hun  <komh78@gmail.com>
+
+	libasprintf: Build a shared library on OS/2
+	* gettext-runtime/libasprintf/configure.ac (LTNOUNDEF): Set to
+	-no-undefined on OS/2.
+
+2016-01-20  KO Myung-Hun  <komh78@gmail.com>
+
+	intl: Support UNIXROOT in BINDTEXTDOMAIN () on EMX
+	$UNIXROOT is a drive on which a root of FHS is.
+
+	* gettext-runtime/intl/bindtextdom.c (BINDTEXTDOMAIN): Prepend
+	$UNIXROOT to dirname if it is started '/' or it is an empty string.
+
+2016-01-20  KO Myung-Hun  <komh78@gmail.com>
+
+	moop: Replace CR as well as LF with a space
+	On OS/2, EOL marker is CR+LF.
+
+	* gnulib-local/bulid-aux/moopp (func_check_header_syntax):
+	Replace CR as well as LF with a space.
+
+2016-01-15  Bruno Haible  <bruno@clisp.org>
+
+	Change msgfmt to produce little-endian .mo files by default.
+	* gettext-tools/src/msgfmt.c (main): Initialize 'byteswap' so as to
+	produce little-endian .mo files by default.
+	* gettext-tools/doc/gettext.texi: Update documentation.
+	* gettext-tools/doc/msgfmt.texi (--endianness): Likewise.
+
+2016-01-13  Daiki Ueno  <ueno@gnu.org>
+
+	maint: Revert copyright year changes in test data
+	Some test programs started failing after mass update of copyright notice
+	for year 2016 (commit 7fa0c277), because of embedded test data with
+	fixed copyright dates.  Revert the commit for those files.
+	Reported by Bruno Haible.
+	* .x-update-copyright: Exclude test programs embedding copyright date.
+	* gettext-tools/tests/msgcomm-22: Revert the last change.
+	* gettext-tools/tests/msgfilter-sr-latin-1: Likewise.
+	* gettext-tools/tests/msggrep-1: Likewise.
+	* gettext-tools/tests/msggrep-2: Likewise.
+	* gettext-tools/tests/msggrep-3: Likewise.
+	* gettext-tools/tests/msggrep-4: Likewise.
+	* gettext-tools/tests/msggrep-5: Likewise.
+	* gettext-tools/tests/msggrep-9: Likewise.
+	* gettext-tools/tests/msggrep-11: Likewise.
+	* gettext-tools/tests/msgmerge-14: Likewise.
+
+2016-01-07  Daiki Ueno  <ueno@gnu.org>
+
+	its: Recognize *.glade as a GtkBuilder file too
+
+2016-01-05  Santiago Vila  <sanvila@unex.es>  (tiny change)
+
+	* PACKAGING: List version specific files
+
+2016-01-02  Daiki Ueno  <ueno@gnu.org>
+
+	maint: Update copyright year
+
+	Update gnulib
+
+	maint: Use maintainer-makefile from gnulib
+	* autogen.sh: Pull GNUmakefile, maint.mk, and dependency scripts in
+	build-aux.
+	* cfg.mk (update-copyright-env): Adjust for gettext.
+	* .x-update-copyright: New file.
+	* .gitignore: Ignore files brought in by gnulib-tool.
+
 2015-12-28  Daiki Ueno  <ueno@gnu.org>
 
+	maint: Update release-steps to current practice
+	* Admin/release-steps: Split document into two sections ('Making a
+	snapshot release' and 'Making an official release'), reorder some steps,
+	and remove mention of manual generation of PO/POT files.
+
 	Update translations
 	* gettext-runtime/po/fr.po: Update from Stéphane Aulery <lkppo@free.fr>.
 	* gettext-runtime/po/nb.po: Update from Johnny A. Solbu <johnny@solbu.net>.
diff --git a/Makefile.am b/Makefile.am
index d95383b..aad2a15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the toplevel directory of GNU gettext
-## Copyright (C) 1995-2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2016 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
diff --git a/NEWS b/NEWS
index b9507ed..bbbf1e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Version 0.19.8 - June 2016
+
+* Support for reproducible builds:
+  - msgfmt now produces little-endian .mo files by default.
+
+* Programming languages support:
+  - XML:
+    xgettext and msgfmt now look for .its files in directories
+    supplied through the GETTEXTDATADIRS or XDG_DATA_DIRS environment
+    variable.
+  - JavaScript:
+    xgettext and msgfmt now recognize numbered arguments in format
+    strings.
+
+* Portability:
+  - Improve OS/2 kLIBC support.
+  - Fix libintl compilation issue with pre-C99 compilers.  It was a
+    regression since 0.19.5.
+  - The AM_GNU_GETTEXT Autoconf macro can now detect musl-libc's
+    gettext as a compatible implementation.
+
 Version 0.19.7 - December 2015
 
 * Programming languages support:
diff --git a/PACKAGING b/PACKAGING
index 033699f..17289f0 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -116,6 +116,7 @@ following file list.
       $prefix/share/gettext/archive.git.tar.gz
       $prefix/share/gettext/archive.dir.tar.gz   (only installed if --without-git specified)
       $prefix/share/gettext/archive.cvs.tar.gz   (only installed if --with-cvs specified)
+      $prefix/share/gettext-$VERSION/its/*
       $prefix/share/aclocal/codeset.m4
       $prefix/share/aclocal/fcntl-o.m4
       $prefix/share/aclocal/gettext.m4
diff --git a/THANKS b/THANKS
index 88addd9..71e9688 100644
--- a/THANKS
+++ b/THANKS
@@ -95,6 +95,7 @@ Colin Watson            cjwatson@debian.org
 Crispin Flowerday       cflowerday@zeus.com
 Daiki Ueno              ueno@gnu.org
 Dalibor Topic           robilad@kaffe.org
+Daniel Burr             dburr@dburr.net
 Daniel Burrows          dburrows@debian.org
 Daniel Leidert          daniel.leidert@wgdd.de
 Daniel Schepler         schepler@math.berkeley.edu
@@ -102,6 +103,7 @@ Danilo Šegan (Данило Шеган)  danilo@gnome.org
 Dave Patton             dpatton@confluence.org
 David Faure             faure@kde.org
 David Fraser            davidf@sjsoft.com
+David Shea              dshea@redhat.com
 Denis Barbier           barbier@linuxfr.org
 Denis Excoffier         Denis.Excoffier@free.fr
 Deniz Akkus             deniz@arayan.com
@@ -228,6 +230,7 @@ Martin Pitt             mpitt@debian.org
 Martin Quinson          martin.quinson@ens-lyon.fr
 Martin v. Löwis         martin@loewis.home.cs.tu-berlin.de
 Maryam Aly              maryam@foursquare.com
+Masanori Ogino          masanori.ogino@gmail.com
 Matt Dreezer            matthew.dreezer@edl.uk.eds.com
 Matthew Behrens         askedrelic@gmail.com
 Matthew McGillis        matthew@jenika.com
@@ -239,6 +242,7 @@ Max Lin                 mlin@suse.com
 Michael C. Toren        mct@toren.net
 Michael Felt            aixtools@gmail.com
 Michael Opdenacker      m-opdenacker@ti.com
+Michael Pyne            mpyne@kde.org
 Michael Schloh von Bennewitz  michael.schloh@cw.com
 Michael Stather         michaelstather@nuzi.de
 Michal Černoevi�        Michal.Cernoevic@pvt.cz
diff --git a/autogen.sh b/autogen.sh
index 604a059..b567272 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 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
@@ -32,7 +32,7 @@
 # data files used by the autopoint program.  If you already have the
 # file, place it under gettext-tools/misc, before running this script.
 #
-# Usage: ./autogen.sh [--skip-gnulib]
+# Usage: ./autogen.sh [--skip-gnulib] [--no-git]
 #
 # Usage after a git clone:              ./autogen.sh
 # Usage from a released tarball:        ./autogen.sh --skip-gnulib
@@ -42,13 +42,21 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 skip_gnulib=false
+
+# Use git to update gnulib sources
+use_git=true
+
 while :; do
   case "$1" in
     --skip-gnulib) skip_gnulib=true; shift;;
+    --no-git) use_git=false; shift;;
     *) break ;;
   esac
 done
 
+$use_git || test -d "$GNULIB_SRCDIR" \
+  || die "Error: --no-git requires --gnulib-srcdir"
+
 cleanup_gnulib() {
   status=$?
   rm -fr "$gnulib_path"
@@ -90,7 +98,7 @@ if ! $skip_gnulib; then
     ;;
   *)
     # Use GNULIB_SRCDIR as a reference.
-    if test -d "$GNULIB_SRCDIR"/.git && \
+    if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
           git_modules_config submodule.gnulib.url >/dev/null; then
       echo "$0: getting gnulib files..."
       if git submodule -h|grep -- --reference > /dev/null; then
@@ -200,6 +208,7 @@ if ! $skip_gnulib; then
       gcd
       getline
       getopt-gnu
+      gettext
       gettext-h
       hash
       html-styled-ostream
@@ -261,8 +270,9 @@ if ! $skip_gnulib; then
       write
       xalloc
       xconcat-filename
-      xmalloca
       xerror
+      xmalloca
+      xmemdup0
       xsetenv
       xstriconv
       xstriconveh
@@ -380,6 +390,11 @@ if ! $skip_gnulib; then
     $GNULIB_TOOL --copy-file tests/init.sh gettext-tools || exit $?
     $GNULIB_TOOL --copy-file build-aux/git-version-gen || exit $?
     $GNULIB_TOOL --copy-file build-aux/gitlog-to-changelog || exit $?
+    $GNULIB_TOOL --copy-file build-aux/update-copyright || exit $?
+    $GNULIB_TOOL --copy-file build-aux/useless-if-before-free || exit $?
+    $GNULIB_TOOL --copy-file build-aux/vc-list-files || exit $?
+    $GNULIB_TOOL --copy-file top/GNUmakefile . || exit $?
+    $GNULIB_TOOL --copy-file top/maint.mk . || exit $?
   fi
 fi
 
@@ -417,48 +432,37 @@ if ! test -f gettext-tools/misc/archive.dir.tar; then
   test $retval -eq 0 || exit $retval
 fi
 
-# Automake requires that ChangeLog exist.
-for dir in . gettext-runtime gettext-runtime/libasprintf \
-           gettext-tools gettext-tools/examples \
-	   gettext-runtime/intl gettext-runtime/po gettext-tools/po; do
-  cat > "$dir/ChangeLog" <<\EOF
-No more ChangeLog files
-========================
-Do not modify any of the ChangeLog files in gettext.  Starting on
-October 14th, 2015 we put changelog information only in the git commit
-log, and generate a top-level ChangeLog file from logs at "make dist"
-time.
-
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
-EOF
-done
-
 # Generate configure script in each subdirectories.
-(cd gettext-runtime/libasprintf
- echo "$0: generating configure in gettext-runtime/libasprintf..."
- aclocal -I ../../m4 -I ../m4 -I gnulib-m4
- autoconf
- autoheader && touch config.h.in
- automake --add-missing --copy
-)
+dir0=`pwd`
 
-(cd gettext-runtime
- echo "$0: generating configure in gettext-runtime..."
- aclocal -I m4 -I ../m4 -I gnulib-m4
- autoconf
- autoheader && touch config.h.in
- automake --add-missing --copy
-)
+echo "$0: generating configure in gettext-runtime/libasprintf..."
+cd gettext-runtime/libasprintf
+aclocal -I ../../m4 -I ../m4 -I gnulib-m4 \
+  && autoconf \
+  && autoheader \
+  && touch ChangeLog config.h.in \
+  && automake --add-missing --copy \
+  || exit $?
+cd "$dir0"
 
-(cd gettext-tools/examples
- echo "$0: generating configure in gettext-tools/examples..."
- aclocal -I ../../gettext-runtime/m4 -I ../../m4
- autoconf
- automake --add-missing --copy
-)
+echo "$0: generating configure in gettext-runtime..."
+cd gettext-runtime
+aclocal -I m4 -I ../m4 -I gnulib-m4 \
+  && autoconf \
+  && autoheader \
+  && touch ChangeLog intl/ChangeLog config.h.in \
+  && automake --add-missing --copy \
+  || exit $?
+cd "$dir0"
+
+echo "$0: generating configure in gettext-tools/examples..."
+cd gettext-tools/examples
+aclocal -I ../../gettext-runtime/m4 -I ../../m4 \
+  && autoconf \
+  && touch ChangeLog \
+  && automake --add-missing --copy \
+  || exit $?
+cd "$dir0"
 
 echo "$0: copying common files from gettext-runtime to gettext-tools..."
 cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
@@ -484,15 +488,16 @@ for file in intl.m4 po.m4; do
   fi
 done
 
-(cd gettext-tools
- echo "$0: generating configure in gettext-tools..."
- aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
- autoconf
- autoheader && touch config.h.in
- test -d intl || mkdir intl
- automake --add-missing --copy
-)
+echo "$0: generating configure in gettext-tools..."
+cd gettext-tools
+aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 \
+  && autoconf \
+  && autoheader && touch ChangeLog config.h.in \
+  && test -d intl || mkdir intl \
+  && automake --add-missing --copy \
+  || exit $?
+cd "$dir0"
+
+aclocal -I m4 && autoconf && touch ChangeLog && automake || exit $?
 
-aclocal -I m4
-autoconf
-automake
+echo "$0: done.  Now you can run './configure'."
diff --git a/build-aux/ac-help.sed b/build-aux/ac-help.sed
index a9cbc9e..3c081fe 100644
--- a/build-aux/ac-help.sed
+++ b/build-aux/ac-help.sed
@@ -1,5 +1,5 @@
 # Sed script for post-processing the trace output of subordinate configures.
-# Copyright (C) 2003, 2005, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2015-2016 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
diff --git a/build-aux/config.guess b/build-aux/config.guess
index b82ee23..c4bd827 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-12-14'
+timestamp='2016-05-15'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-12-14'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -237,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -268,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -376,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -410,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -635,13 +642,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -680,11 +687,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -697,12 +704,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -807,14 +814,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -896,7 +903,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -919,7 +926,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -1272,6 +1279,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1285,9 +1295,9 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1309,7 +1319,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1340,7 +1350,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1382,7 +1392,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1401,18 +1411,17 @@ esac
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
diff --git a/build-aux/config.libpath b/build-aux/config.libpath
index 5b0285c..849fa7b 100755
--- a/build-aux/config.libpath
+++ b/build-aux/config.libpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable at run time.
 #
-#   Copyright 1996-2015 Free Software Foundation, Inc.
+#   Copyright 1996-2016 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2003
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index a3e25c8..98183ff 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2015 Free Software Foundation, Inc.
+#   Copyright 1996-2016 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 0cd7016..6d86a1e 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-12-14'
+timestamp='2016-05-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ timestamp='2015-12-14'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1382,7 +1382,7 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@@ -1399,7 +1399,7 @@ case $os in
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos*)
+	      | -onefs* | -tirtos* | -phoenix*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1531,6 +1531,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
diff --git a/build-aux/csharpcomp.sh.in b/build-aux/csharpcomp.sh.in
index 848fe12..e33ff93 100644
--- a/build-aux/csharpcomp.sh.in
+++ b/build-aux/csharpcomp.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Compile a C# program.
 
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/csharpexec.sh.in b/build-aux/csharpexec.sh.in
index 9cc910f..07b29d2 100644
--- a/build-aux/csharpexec.sh.in
+++ b/build-aux/csharpexec.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Execute a C# program.
 
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 8e92c0a..bd2c4b6 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,8 +1,8 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2014-12-02.19; # UTC
+scriptversion=2016-05-08.18; # UTC
 
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2016 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
@@ -101,8 +101,8 @@ while test $# -gt 0; do
   case $1 in
     --help) echo "$usage"; exit 0;;
     --version) echo "$version"; exit 0;;
-    --prefix) shift; prefix="$1";;
-    --fallback) shift; fallback="$1";;
+    --prefix) shift; prefix=${1?};;
+    --fallback) shift; fallback=${1?};;
     -*)
       echo "$0: Unknown option '$1'." >&2
       echo "$0: Try '--help' for more information." >&2
@@ -221,6 +221,6 @@ printf %s "$v"
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/build-aux/install-reloc b/build-aux/install-reloc
index 8d2e741..979a056 100755
--- a/build-aux/install-reloc
+++ b/build-aux/install-reloc
@@ -1,6 +1,6 @@
 #!/bin/sh
 # install-reloc - install a program including a relocating wrapper
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/javacomp.sh.in b/build-aux/javacomp.sh.in
index 88a633d..d026c7a 100644
--- a/build-aux/javacomp.sh.in
+++ b/build-aux/javacomp.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Compile a Java program.
 
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2016 Free Software Foundation, Inc.
 # Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/javaexec.sh.in b/build-aux/javaexec.sh.in
index 8d67d36..20486b4 100644
--- a/build-aux/javaexec.sh.in
+++ b/build-aux/javaexec.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Execute a Java program.
 
-# Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2016 Free Software Foundation, Inc.
 # Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/moopp b/build-aux/moopp
index 96a50a6..c155d93 100755
--- a/build-aux/moopp
+++ b/build-aux/moopp
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Minimal Object-Oriented style PreProcessor.
 
-# Copyright (C) 2006-2008, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2008, 2015-2016 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2006.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -306,12 +306,12 @@ func_check_header_syntax ()
   }
   class_end_lineno=`expr $methods_lineno + $class_end_lineno`
   sed_extract_methods="$class_end_lineno"',$d;1,'"$methods_lineno"'d'
-  methods=`sed -e "$sed_remove_comments" < "$file" | sed -e "$sed_extract_methods" | tr '\n' ' ' | tr ';' '\n' | sed -e 's,[ 	]*$,,'`
+  methods=`sed -e "$sed_remove_comments" < "$file" | sed -e "$sed_extract_methods" | tr '\015\n' '  ' | tr ';' '\n' | sed -e 's,[ 	]*$,,'`
   sed_remove_valid_arg1_lines='/([ 	]*'"$classname"'_t[ 	]*[A-Za-z_0-9]*[ 	]*[,)]/d'
   sed_extract_method_name='s,^.*[^A-Za-z_0-9]\([A-Za-z_0-9][A-Za-z_0-9]*\)[ 	]*(.*$,\1,'
   methods_with_bad_arg1=`echo "$methods" | sed -e "$sed_remove_empty_lines" -e "$sed_remove_valid_arg1_lines" -e "$sed_extract_method_name"`
   if test -n "$methods_with_bad_arg1"; then
-    methods_with_bad_arg1=`{ echo "$methods_with_bad_arg1" | sed -e 's/$/, /' | tr -d '\n'; echo; } | sed -e 's/\(, \)*$//'`
+    methods_with_bad_arg1=`{ echo "$methods_with_bad_arg1" | sed -e 's/$/, /' | tr -d '\015\n'; echo; } | sed -e 's/\(, \)*$//'`
     func_fatal_error "$file: some methods don't have a first argument of type ${classname}_t: $methods_with_bad_arg1"
   fi
 }
diff --git a/build-aux/reloc-ldflags b/build-aux/reloc-ldflags
index 4fecaf8..65b510a 100755
--- a/build-aux/reloc-ldflags
+++ b/build-aux/reloc-ldflags
@@ -2,7 +2,7 @@
 # Output a system dependent linker command for putting a relocatable library
 # search path into an executable.
 #
-#   Copyright 2003-2015 Free Software Foundation, Inc.
+#   Copyright 2003-2016 Free Software Foundation, Inc.
 #   Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 #   This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/relocatable.sh.in b/build-aux/relocatable.sh.in
index 3f95d75..bd14291 100644
--- a/build-aux/relocatable.sh.in
+++ b/build-aux/relocatable.sh.in
@@ -6,7 +6,7 @@
 # package by hand; see doc/relocatable-maint.texi (in Gnulib) for
 # details.
 #
-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2016 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
diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h
index 0d55e2b..584649f 100644
--- a/build-aux/snippet/arg-nonnull.h
+++ b/build-aux/snippet/arg-nonnull.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h
index 585b38a..813f2e2 100644
--- a/build-aux/snippet/c++defs.h
+++ b/build-aux/snippet/c++defs.h
@@ -1,5 +1,5 @@
 /* C++ compatible function declaration macros.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h
index f507eb7..843db76 100644
--- a/build-aux/snippet/unused-parameter.h
+++ b/build-aux/snippet/unused-parameter.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific function parameters are not used.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h
index 90f4985..2948b47 100644
--- a/build-aux/snippet/warn-on-use.h
+++ b/build-aux/snippet/warn-on-use.h
@@ -1,5 +1,5 @@
 /* A C macro for emitting warnings if a function is used.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/configure b/configure
index a3a99a1..fb3fc2e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gettext 0.19.7.
+# Generated by GNU Autoconf 2.69 for gettext 0.19.8.1.
 #
 # Report bugs to <bug-gnu-gettext@gnu.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gettext'
 PACKAGE_TARNAME='gettext'
-PACKAGE_VERSION='0.19.7'
-PACKAGE_STRING='gettext 0.19.7'
+PACKAGE_VERSION='0.19.8.1'
+PACKAGE_STRING='gettext 0.19.8.1'
 PACKAGE_BUGREPORT='bug-gnu-gettext@gnu.org'
 PACKAGE_URL=''
 
@@ -1297,7 +1297,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gettext 0.19.7 to adapt to many kinds of systems.
+\`configure' configures gettext 0.19.8.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1368,7 +1368,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gettext 0.19.7:";;
+     short | recursive ) echo "Configuration of gettext 0.19.8.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1551,7 +1551,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gettext configure 0.19.7
+gettext configure 0.19.8.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1568,7 +1568,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gettext $as_me 0.19.7, which was
+It was created by gettext $as_me 0.19.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2432,7 +2432,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gettext'
- VERSION='0.19.7'
+ VERSION='0.19.8.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3654,7 +3654,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gettext $as_me 0.19.7, which was
+This file was extended by gettext $as_me 0.19.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3707,7 +3707,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gettext config.status 0.19.7
+gettext config.status 0.19.8.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 5e996fa..78a063b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the toplevel directory of GNU gettext
-dnl Copyright (C) 1995-2003, 2005-2006, 2009-2010, 2015 Free Software
+dnl Copyright (C) 1995-2003, 2005-2006, 2009-2010, 2015-2016 Free Software
 dnl Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/ABOUT-NLS b/gettext-runtime/ABOUT-NLS
index 1551426..3cc8286 100644
--- a/gettext-runtime/ABOUT-NLS
+++ b/gettext-runtime/ABOUT-NLS
@@ -205,7 +205,7 @@ translation percentage of at least 50%.
      grub               |                                         []        |
      gsasl              |                                                   |
      gss                |                                                   |
-     gst-plugins-bad    |                                                [] |
+     gst-plugins-bad    |                          []                    [] |
      gst-plugins-base   |                          []             []     [] |
      gst-plugins-good   |                          []             []     [] |
      gst-plugins-ugly   |                          []             []     [] |
@@ -231,7 +231,6 @@ translation percentage of at least 50%.
      jwhois             |                                                   |
      kbd                |                                                [] |
      klavaro            |          []              [] []          []     [] |
-     latrine            |                                                   |
      ld                 |                          []                       |
      leafpad            |                       [] []             []     [] |
      libc               |                          []             []     [] |
@@ -262,6 +261,7 @@ translation percentage of at least 50%.
      opcodes            |                                                   |
      parted             |                                                [] |
      pies               |                                                   |
+     pnmixer            |                                                   |
      popt               |                                                [] |
      procps-ng          |                                                   |
      procps-ng-man      |                                                   |
@@ -276,11 +276,11 @@ translation percentage of at least 50%.
      rpm                |                                                   |
      rush               |                                                   |
      sarg               |                                                   |
-     sed                |                []                       []     [] |
+     sed                |                []        []             []     [] |
      sharutils          |                                                [] |
      shishi             |                                                   |
      skribilo           |                                                   |
-     solfege            |                                                [] |
+     solfege            |                                         []     [] |
      solfege-manual     |                                                   |
      spotmachine        |                                                   |
      sudo               |                                         []     [] |
@@ -288,7 +288,7 @@ translation percentage of at least 50%.
      sysstat            |                                                [] |
      tar                |                          []             []     [] |
      texinfo            |                                         []     [] |
-     texinfo_document   |                                         []        |
+     texinfo_document   |                                         []     [] |
      tigervnc           |                          []                       |
      tin                |                                                   |
      tin-man            |                                                   |
@@ -310,9 +310,9 @@ translation percentage of at least 50%.
      xkeyboard-config   |                          []             []     [] |
                         +---------------------------------------------------+
                           af am an ar as ast az be bg bn bn_IN bs ca crh cs
-                           4  0  2  5  3 11   0  8 23  3   3    1 54  4  73
+                           4  0  2  5  3 11   0  8 25  3   3    1 55  4  74
 
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr
+                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
                         +--------------------------------------------------+
      a2ps               | []  []  []     []         [] [] []       []  []  |
      aegis              | []  []                       []              []  |
@@ -324,7 +324,7 @@ translation percentage of at least 50%.
      bison              | []  []  []                [] [] []       []  []  |
      bison-runtime      | []  []  []                [] [] []       []  []  |
      buzztrax           | []  []                                   []  []  |
-     ccd2cue            | []  []                                       []  |
+     ccd2cue            | []  []                    []                 []  |
      ccide              | []  []                    [] []          []  []  |
      cflow              | []  []                    []             []  []  |
      clisp              | []  []     []                []              []  |
@@ -355,7 +355,7 @@ translation percentage of at least 50%.
      gas                |                              []          []  []  |
      gawk               | []  []                       []          []  []  |
      gcal               | []  []                       []              []  |
-     gcc                |     []                       []                  |
+     gcc                |     []                                           |
      gdbm               | []  []                    []             []  []  |
      gettext-examples   | []  []  []                [] []          []  []  |
      gettext-runtime    | []  []                    [] []          []  []  |
@@ -377,7 +377,7 @@ translation percentage of at least 50%.
      grub               | []  []                       []          []  []  |
      gsasl              | []  []                    []             []  []  |
      gss                | []  []                    []             []  []  |
-     gst-plugins-bad    | []  []                                           |
+     gst-plugins-bad    | []  []                                       []  |
      gst-plugins-base   | []  []  []                   []          []  []  |
      gst-plugins-good   | []  []  []                   []    []    []  []  |
      gst-plugins-ugly   | []  []  []                [] []    []    []  []  |
@@ -403,7 +403,6 @@ translation percentage of at least 50%.
      jwhois             |     []                    [] []          []  []  |
      kbd                | []  []  []                [] []              []  |
      klavaro            | []  []  []                [] []    []        []  |
-     latrine            | []  ()                    []             []      |
      ld                 | []                           []          []  []  |
      leafpad            | []  []  []                [] []    []    []  []  |
      libc               | []  []                       []          []  []  |
@@ -434,6 +433,7 @@ translation percentage of at least 50%.
      opcodes            | []  []                       []          []  []  |
      parted             | []  []                                       []  |
      pies               |     []                                           |
+     pnmixer            |     []                                       []  |
      popt               | []  []                    [] []          []  []  |
      procps-ng          |     []                                       []  |
      procps-ng-man      |     []                                       []  |
@@ -451,10 +451,10 @@ translation percentage of at least 50%.
      sed                | []  []  []                [] [] []       []  []  |
      sharutils          |     []                    []    []           []  |
      shishi             |     []                                   []  []  |
-     skribilo           | []                                           []  |
+     skribilo           | []                           []              []  |
      solfege            | []  []                    [] [] []    [] []  []  |
      solfege-manual     |     []                    [] [] []           []  |
-     spotmachine        | []  []                    []             []      |
+     spotmachine        | []  []                    []             []  []  |
      sudo               | []  []                    [] []          []  []  |
      sudoers            | []  []  []                []             []  []  |
      sysstat            | []  []                    [] []          []  []  |
@@ -471,7 +471,7 @@ translation percentage of at least 50%.
      vice               | ()  ()                                       ()  |
      vmm                |     []                                   []      |
      vorbis-tools       | []  []                    []                 []  |
-     wastesedge         | []                                           ()  |
+     wastesedge         | []                                               |
      wcd                |     []                    [] []          []      |
      wcd-man            |     []                                           |
      wdiff              | []  []                    [] [] []       []  []  |
@@ -481,8 +481,8 @@ translation percentage of at least 50%.
      xdg-user-dirs      | []  []  []                [] [] [] [] [] []  []  |
      xkeyboard-config   | []  []  []                [] []          []  []  |
                         +--------------------------------------------------+
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr
-                          120 130 32  1   6     0   94 95 22 13  4 103 136
+                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
+                          119 131 32  1   6     0   94 95 22 13  4 102 139
 
                           ga gd gl gu he hi hr hu hy ia id is it ja ka kk
                         +-------------------------------------------------+
@@ -490,7 +490,7 @@ translation percentage of at least 50%.
      aegis              |                                     []          |
      anubis             |                   [] []       []    []          |
      aspell             | []                []          []    [] []       |
-     bash               |                               []    [] []       |
+     bash               |                      []       []    [] []       |
      bfd                |                               []       []       |
      binutils           |                               []    [] []       |
      bison              |                   []                            |
@@ -500,7 +500,7 @@ translation percentage of at least 50%.
      ccide              |                   [] []                         |
      cflow              | []                []          []                |
      clisp              |                                                 |
-     coreutils          |                      []             [] []       |
+     coreutils          |                      []                []       |
      cpio               | []                [] []       []    [] []       |
      cppi               |       []          [] []             [] []       |
      cpplib             |                               []       []       |
@@ -516,7 +516,7 @@ translation percentage of at least 50%.
      doodle             | []                                  []          |
      dos2unix           |                      []                []       |
      dos2unix-man       |                                                 |
-     e2fsprogs          |                               []                |
+     e2fsprogs          |                      []       []                |
      enscript           | []                []          []                |
      exif               |       []          []          [] [] [] []       |
      fetchmail          |                               []    [] []       |
@@ -536,7 +536,7 @@ translation percentage of at least 50%.
      glunarclock        | []    []          [] []       []    []          |
      gnubiff            |                      []       []    ()          |
      gnubik             |       []          []                []          |
-     gnucash            |          () () ()    ()             () []       |
+     gnucash            |          () () ()    ()             ()          |
      gnuchess           |                                                 |
      gnulib             | []    []             []             [] []       |
      gnunet             |                                                 |
@@ -549,7 +549,7 @@ translation percentage of at least 50%.
      grub               |       []             []             []          |
      gsasl              | []                [] []       []    []          |
      gss                | []                [] []       []    []          |
-     gst-plugins-bad    |                      []                         |
+     gst-plugins-bad    |                   [] []       []                |
      gst-plugins-base   |       []          [] []       []                |
      gst-plugins-good   |       []          [] []       []    [] []       |
      gst-plugins-ugly   |       []          [] []       []    [] []       |
@@ -575,7 +575,6 @@ translation percentage of at least 50%.
      jwhois             |       []             []       []    []          |
      kbd                |                      []       []    []          |
      klavaro            |       []          [] []             []       [] |
-     latrine            |                      []                         |
      ld                 | []                            []    [] []       |
      leafpad            | []    []    []    [] []       []    [] ()       |
      libc               |       []          []          []    [] []       |
@@ -602,10 +601,11 @@ translation percentage of at least 50%.
      minicom            |                      []       []       []       |
      mkisofs            |                               []    []          |
      myserver           |                                     []          |
-     nano               | []    []             []             [] []       |
+     nano               | []    []          [] []             [] []       |
      opcodes            | []                            []    []          |
-     parted             |       []                      []    [] []       |
+     parted             |       []             []       []    [] []       |
      pies               |                                                 |
+     pnmixer            |                   []                []          |
      popt               | []    [] []       [] []    [] [] [] [] []       |
      procps-ng          |                                                 |
      procps-ng-man      |                                                 |
@@ -629,10 +629,10 @@ translation percentage of at least 50%.
      spotmachine        |                                                 |
      sudo               |       []          []                [] []       |
      sudoers            |                   []                [] []       |
-     sysstat            |                      []       []       []       |
+     sysstat            |                   [] []       []       []       |
      tar                | []                [] []       []    [] []       |
      texinfo            |                   []          []    []          |
-     texinfo_document   |                      []             []          |
+     texinfo_document   |                   [] []             []          |
      tigervnc           |                                                 |
      tin                |                                                 |
      tin-man            |                                                 |
@@ -643,20 +643,20 @@ translation percentage of at least 50%.
      vice               |                      ()             ()          |
      vmm                |                                                 |
      vorbis-tools       |                   []          []                |
-     wastesedge         |                                     ()          |
+     wastesedge         |                                     []          |
      wcd                |                                                 |
      wcd-man            |                                                 |
      wdiff              |       []             []             []          |
-     wget               |                      []             [] []       |
+     wget               |                   [] []             [] []       |
      wyslij-po          |       []          []          []                |
      xboard             |                                                 |
      xdg-user-dirs      | [] [] [] [] [] [] [] []    [] [] [] [] []    [] |
-     xkeyboard-config   |       []             []       []    [] []       |
+     xkeyboard-config   |       []          [] []       []    [] []       |
                         +-------------------------------------------------+
                           ga gd gl gu he hi hr hu hy ia id is it ja ka kk
-                          35  2 47  4  8  2 53 69  2  6 80 11 86 58  0  3
+                          35  2 47  4  8  2 60 71  2  6 81 11 87 57  0  3
 
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
+                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
                         +--------------------------------------------------+
      a2ps               |                                  []          []  |
      aegis              |                                              []  |
@@ -690,7 +690,7 @@ translation percentage of at least 50%.
      dos2unix-man       |                                              []  |
      e2fsprogs          |                                              []  |
      enscript           |                                              []  |
-     exif               |                   []                         []  |
+     exif               |    []             []                         []  |
      fetchmail          |                                              []  |
      findutils          |                                        []    []  |
      flex               |                                              []  |
@@ -702,7 +702,7 @@ translation percentage of at least 50%.
      gcc                |                                                  |
      gdbm               |                                                  |
      gettext-examples   |          []       []             [] [] []    []  |
-     gettext-runtime    |    []                                        []  |
+     gettext-runtime    |    []                                  []    []  |
      gettext-tools      |    []                                            |
      gjay               |                                                  |
      glunarclock        |                   []                         []  |
@@ -721,11 +721,11 @@ translation percentage of at least 50%.
      grub               |                []                      []    []  |
      gsasl              |                                              []  |
      gss                |                                                  |
-     gst-plugins-bad    |                                        []    []  |
+     gst-plugins-bad    |                   []                   []    []  |
      gst-plugins-base   |                   []                   []    []  |
      gst-plugins-good   |                [] []                   []    []  |
      gst-plugins-ugly   |                   []             [] [] []    []  |
-     gstreamer          |                []                            []  |
+     gstreamer          |                []                      []    []  |
      gtick              |                                              []  |
      gtkam              |                                        []    []  |
      gtkspell           |          []    [] []       []    []    []    []  |
@@ -747,7 +747,6 @@ translation percentage of at least 50%.
      jwhois             |                   []                         []  |
      kbd                |                                              []  |
      klavaro            |                                        []    []  |
-     latrine            |                                                  |
      ld                 |                                                  |
      leafpad            |    []    []    [] []                         []  |
      libc               |    []                                        []  |
@@ -776,8 +775,9 @@ translation percentage of at least 50%.
      myserver           |                                                  |
      nano               |                                  []    []    []  |
      opcodes            |                                              []  |
-     parted             |                                              []  |
+     parted             |    []                                        []  |
      pies               |                                                  |
+     pnmixer            |                                              []  |
      popt               | [] []             []                   []    []  |
      procps-ng          |                                                  |
      procps-ng-man      |                                                  |
@@ -799,8 +799,8 @@ translation percentage of at least 50%.
      solfege            |                                        []    []  |
      solfege-manual     |                                              []  |
      spotmachine        |                                              []  |
-     sudo               |                                        []    []  |
-     sudoers            |                                        []    []  |
+     sudo               |    []                                  []    []  |
+     sudoers            |    []                                  []    []  |
      sysstat            |                                        []    []  |
      tar                |          []                            []    []  |
      texinfo            |                                              []  |
@@ -825,524 +825,524 @@ translation percentage of at least 50%.
      xdg-user-dirs      | [] [] [] []    [] [] [] []    []       []    []  |
      xkeyboard-config   |    []          []                            []  |
                         +--------------------------------------------------+
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
-                           5 11  4  6  0 13 22  3  3  3  4 11  2 40  1 124
+                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
+                           5 15  4  6  0 13 23  3  3  3  4 11  2 42  1 125
 
-                          nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-                        +--------------------------------------------------+
-     a2ps               |             []     []  []   [] []       []    [] |
-     aegis              |                        []      []                |
-     anubis             |             []                 []             [] |
-     aspell             |             []         []   [] []    [] []    [] |
-     bash               |             []                 []    [] []    [] |
-     bfd                |                                []                |
-     binutils           |                                []             [] |
-     bison              |             []         []                     [] |
-     bison-runtime      |             []     []  []   [] []       [] [] [] |
-     buzztrax           |                                                  |
-     ccd2cue            |                        []                        |
-     ccide              |             []                 []             [] |
-     cflow              |             []                                [] |
-     clisp              |                                []                |
-     coreutils          |             []                 []       []    [] |
-     cpio               |             []                 []             [] |
-     cppi               |             []         []                     [] |
-     cpplib             |                        []      []             [] |
-     cryptsetup         |             []                                [] |
-     datamash           |                        []                     [] |
-     denemo             |                                                  |
-     dfarc              |             []         []                     [] |
-     dialog             |             []         []   [] []    [] []    [] |
-     dico               |             []                                   |
-     diffutils          |             []                                [] |
-     dink               |                                                  |
-     direvent           |             []         []                        |
-     doodle             |                                            [] [] |
-     dos2unix           |             []         []      []             [] |
-     dos2unix-man       |             []         []                        |
-     e2fsprogs          |             []                                   |
-     enscript           |             []         []   [] []       []    [] |
-     exif               |             []         []   [] []    []       [] |
-     fetchmail          |             []                 []          []    |
-     findutils          |             []         []      []       []    [] |
-     flex               |             []         []   [] []             [] |
-     freedink           |             []         []      []       []    [] |
-     fusionforge        |                                                  |
-     gas                |                                                  |
-     gawk               |             []                                   |
-     gcal               |                                                  |
-     gcc                |                                                  |
-     gdbm               |             []         []                     [] |
-     gettext-examples   |             []     []  []   [] []    [] []    [] |
-     gettext-runtime    | []          []     []  []   [] []    [] []    [] |
-     gettext-tools      |             []         []   [] []    [] []    [] |
-     gjay               |                                               [] |
-     glunarclock        |             []         []   []       [] []    [] |
-     gnubiff            |                                               [] |
-     gnubik             |             []         []               []    [] |
-     gnucash            |             ()         ()   () ()             [] |
-     gnuchess           |                        []                     [] |
-     gnulib             |             []         []      []       []    [] |
-     gnunet             |                                                  |
-     gnunet-gtk         |                                                  |
-     gold               |                                                  |
-     gphoto2            |             []         []   [] []             [] |
-     gprof              |                        []   [] []             [] |
-     gramadoir          |                                      []       [] |
-     grep               |             []         []      []    [] []    [] |
-     grub               |             []         []      []       []    [] |
-     gsasl              |             []                       []       [] |
-     gss                |             []              []       []       [] |
-     gst-plugins-bad    |             []         []      []             [] |
-     gst-plugins-base   |             []         []      []    [] []    [] |
-     gst-plugins-good   |             []         []   [] []    [] []    [] |
-     gst-plugins-ugly   |             []         []   [] []    [] []    [] |
-     gstreamer          |             []         []   [] []    [] []    [] |
-     gtick              |             []         []      []    []       [] |
-     gtkam              |          [] []         []      []    []       [] |
-     gtkspell           |             []     []  []   [] []    [] [] [] [] |
-     guix               |                                                  |
-     guix-packages      |                                                  |
-     gutenprint         |                                      [] []       |
-     hello              |             []         []      []    [] []    [] |
-     help2man           |             []         []      []             [] |
-     help2man-texi      |             []                                   |
-     hylafax            |                                                  |
-     idutils            |             []                 []             [] |
-     iso_15924          |             []     ()       [] []       []    [] |
-     iso_3166           | [] []    [] []     ()  []   [] [] [] [] [] [] [] |
-     iso_3166_2         |             []     ()                         [] |
-     iso_4217           | []          []     ()       [] [] []    []    [] |
-     iso_639            |    []    [] []     ()       [] [] [] [] []    [] |
-     iso_639_3          |          []        ()                            |
-     iso_639_5          |                    ()                         [] |
-     jwhois             |             []         []   []                [] |
-     kbd                |             []                 []                |
-     klavaro            |          [] []         []      []       []       |
-     latrine            |                        []                        |
-     ld                 |                                                  |
-     leafpad            | []    []    []     []  []      []    [] []    [] |
-     libc               |             []                 []    []          |
-     libexif            |             []         ()            []          |
-     libextractor       |             []                                   |
-     libgnutls          |             []                                   |
-     libgphoto2         |             []                                   |
-     libgphoto2_port    |             []         []      []    []       [] |
-     libgsasl           |             []              []       []       [] |
-     libiconv           |             []         []            [] []    [] |
-     libidn             |             []         []                     [] |
-     liferea            |             []     []  []   [] ()    []    []    |
-     lilypond           |                                                  |
-     lordsawar          |                                                  |
-     lprng              |             []                                   |
-     lynx               |                        []      []                |
-     m4                 |             []         []   [] []             [] |
-     mailfromd          |             []                                   |
-     mailutils          |             []                                   |
-     make               |             []         []      []                |
-     man-db             |             []                 []             [] |
-     man-db-manpages    |             []                 []             [] |
-     midi-instruments   |             []     []  []   [] []    [] []    [] |
-     minicom            |             []         []   [] []                |
-     mkisofs            |             []                 []             [] |
-     myserver           |                                         []    [] |
-     nano               |             []         []   [] []       []    [] |
-     opcodes            |                                                  |
-     parted             |             []         []      []    [] []    [] |
-     pies               |             []                                   |
-     popt               |             []     []  []      []       []    [] |
-     procps-ng          |             []                                   |
-     procps-ng-man      |             []                                   |
-     psmisc             |             []         []      []             [] |
-     pspp               |             []                 []                |
-     pushover           |                                                  |
-     pwdutils           |             []                                   |
-     pyspread           | []                     []                        |
-     radius             |             []                 []                |
-     recode             |             []     []  []   [] []    [] []    [] |
-     recutils           |                                               [] |
-     rpm                |             []                                   |
-     rush               |             []         []                     [] |
-     sarg               |                        []      []                |
-     sed                |             []     []  []   [] []    [] []    [] |
-     sharutils          |             []         []                     [] |
-     shishi             |             []                                [] |
-     skribilo           |                                                  |
-     solfege            |             []         []      []                |
-     solfege-manual     |             []         []                        |
-     spotmachine        |                        []                     [] |
-     sudo               |             []         []      []    [] []    [] |
-     sudoers            |             []         []               []    [] |
-     sysstat            |             []         []      []    []       [] |
-     tar                |             []         []      []       []    [] |
-     texinfo            |             []         []      []                |
-     texinfo_document   |             []         []                        |
-     tigervnc           |                        []                        |
-     tin                |                                []                |
-     tin-man            |                                                  |
-     tracgoogleappsa... |             []         []      []             [] |
-     trader             |                                []                |
-     util-linux         |             []         []                        |
-     ve                 |             []         []                     [] |
-     vice               |                                                  |
-     vmm                |                                                  |
-     vorbis-tools       |             []                          []    [] |
-     wastesedge         |                                                  |
-     wcd                |                                                  |
-     wcd-man            |                                                  |
-     wdiff              |             []         []      []       []    [] |
-     wget               |             []         []      []    []          |
-     wyslij-po          | []          []         []                     [] |
-     xboard             |             []                 []             [] |
-     xdg-user-dirs      | [] []    [] []  [] []  []   [] []    [] [] [] [] |
-     xkeyboard-config   |             []         []      []       []       |
-                        +--------------------------------------------------+
-                          nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-                           7  3  1  6 114  1 12  83   32 80  3 38 45  7 94
+                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
+                        +------------------------------------------------+
+     a2ps               |          []     []  []   [] []       []    []  |
+     aegis              |                     []      []                 |
+     anubis             |          []                 []             []  |
+     aspell             |          []         []   [] []    [] []    []  |
+     bash               |          []         []      []    [] []    []  |
+     bfd                |                             []             []  |
+     binutils           |                             []             []  |
+     bison              |          []         []                     []  |
+     bison-runtime      |          []     []  []   [] []       [] [] []  |
+     buzztrax           |                     []                         |
+     ccd2cue            |                     []                     []  |
+     ccide              |          []                 []             []  |
+     cflow              |          []         []                     []  |
+     clisp              |                             []                 |
+     coreutils          |          []                 []       []    []  |
+     cpio               |          []                 []             []  |
+     cppi               |          []         []                     []  |
+     cpplib             |                     []      []             []  |
+     cryptsetup         |          []         []                     []  |
+     datamash           |                     []                     []  |
+     denemo             |                                                |
+     dfarc              |          []         []                     []  |
+     dialog             |          []         []   [] []    [] []    []  |
+     dico               |          []                                    |
+     diffutils          |          []         []                     []  |
+     dink               |                                                |
+     direvent           |          []         []                     []  |
+     doodle             |                                         [] []  |
+     dos2unix           |          []         []      []             []  |
+     dos2unix-man       |          []         []                         |
+     e2fsprogs          |          []                                    |
+     enscript           |          []         []   [] []       []    []  |
+     exif               |          []         []   [] []    []       []  |
+     fetchmail          |          []                 []          []     |
+     findutils          |          []         []      []    [] []    []  |
+     flex               |          []         []   [] []             []  |
+     freedink           |          []         []      []       []    []  |
+     fusionforge        |                                                |
+     gas                |                                                |
+     gawk               |          []                                    |
+     gcal               |                                                |
+     gcc                |                                                |
+     gdbm               |          []         []                     []  |
+     gettext-examples   |          []     []  []   [] []    [] []    []  |
+     gettext-runtime    | []       []     []  []   [] []    [] []    []  |
+     gettext-tools      |          []         []   [] []    [] []    []  |
+     gjay               |                                            []  |
+     glunarclock        |          []         []   []       [] []    []  |
+     gnubiff            |                                            []  |
+     gnubik             |          []         []               []    []  |
+     gnucash            |          ()     ()  ()   () ()             []  |
+     gnuchess           |                     []                     []  |
+     gnulib             |          []         []      []       []    []  |
+     gnunet             |                                                |
+     gnunet-gtk         |                                                |
+     gold               |                                                |
+     gphoto2            |          []         []   [] []             []  |
+     gprof              |                     []   [] []             []  |
+     gramadoir          |                                   []       []  |
+     grep               |          []         []      []    [] []    []  |
+     grub               |          []         []      []       []    []  |
+     gsasl              |          []                       []       []  |
+     gss                |          []              []       []       []  |
+     gst-plugins-bad    |          []         []      []    []       []  |
+     gst-plugins-base   |          []         []      []    [] []    []  |
+     gst-plugins-good   |          []         []   [] []    [] []    []  |
+     gst-plugins-ugly   |          []         []   [] []    [] []    []  |
+     gstreamer          |          []         []   [] []    [] []    []  |
+     gtick              |          []         []      []    []       []  |
+     gtkam              |       [] []         []      []    []       []  |
+     gtkspell           |          []     []  []   [] []    [] [] [] []  |
+     guix               |                                                |
+     guix-packages      |                                                |
+     gutenprint         |                                   [] []        |
+     hello              |          []         []      []    [] []    []  |
+     help2man           |          []         []      []             []  |
+     help2man-texi      |          []                                    |
+     hylafax            |                                                |
+     idutils            |          []                 []             []  |
+     iso_15924          |          []     ()       [] []       []    []  |
+     iso_3166           | [] [] [] []     ()  []   [] [] [] [] [] [] []  |
+     iso_3166_2         |          []     ()                         []  |
+     iso_4217           | []       []     ()       [] [] []    []    []  |
+     iso_639            |    [] [] []     ()       [] [] [] [] []    []  |
+     iso_639_3          |       []        ()                             |
+     iso_639_5          |                 ()                         []  |
+     jwhois             |          []         []   []                []  |
+     kbd                |          []                 []                 |
+     klavaro            |       [] []         []      []       []        |
+     ld                 |                                                |
+     leafpad            | []       []     []  []      []    [] []    []  |
+     libc               |          []                 []    []           |
+     libexif            |          []         ()            []           |
+     libextractor       |          []                                    |
+     libgnutls          |          []                                    |
+     libgphoto2         |          []                                    |
+     libgphoto2_port    |          []         []      []    []       []  |
+     libgsasl           |          []              []       []       []  |
+     libiconv           |          []         []            [] []    []  |
+     libidn             |          []         []                     []  |
+     liferea            |          []     []  []   [] ()    []    []     |
+     lilypond           |                                                |
+     lordsawar          |                                                |
+     lprng              |          []                                    |
+     lynx               |                     []      []                 |
+     m4                 |          []         []   [] []             []  |
+     mailfromd          |          []                                    |
+     mailutils          |          []                                    |
+     make               |          []         []      []                 |
+     man-db             |          []                 []             []  |
+     man-db-manpages    |          []                 []             []  |
+     midi-instruments   |          []     []  []   [] []    [] []    []  |
+     minicom            |          []         []   [] []                 |
+     mkisofs            |          []                 []             []  |
+     myserver           |                                      []    []  |
+     nano               |          []         []   [] []       []    []  |
+     opcodes            |                                                |
+     parted             |          []         []      []    [] []    []  |
+     pies               |          []                                    |
+     pnmixer            |                             []                 |
+     popt               |          []     []  []      []       []    []  |
+     procps-ng          |          []                                    |
+     procps-ng-man      |          []                                    |
+     psmisc             |          []         []      []             []  |
+     pspp               |          []                 []                 |
+     pushover           |                                                |
+     pwdutils           |          []                                    |
+     pyspread           | []                  []                         |
+     radius             |          []                 []                 |
+     recode             |          []     []  []   [] []    [] []    []  |
+     recutils           |                     []                     []  |
+     rpm                |          []                                    |
+     rush               |          []         []                     []  |
+     sarg               |                     []      []                 |
+     sed                |          []     []  []   [] []    [] []    []  |
+     sharutils          |          []         []                     []  |
+     shishi             |          []                                []  |
+     skribilo           |                                            []  |
+     solfege            |          []         []      []                 |
+     solfege-manual     |          []         []                         |
+     spotmachine        |                     []                     []  |
+     sudo               |          []         []      []    [] []    []  |
+     sudoers            |          []         []               []    []  |
+     sysstat            |          []         []      []    []       []  |
+     tar                |          []         []      []       []    []  |
+     texinfo            |          []         []      []                 |
+     texinfo_document   |          []         []                         |
+     tigervnc           |                     []      []             []  |
+     tin                |                             []                 |
+     tin-man            |                                                |
+     tracgoogleappsa... |          []         []      []             []  |
+     trader             |                             []             []  |
+     util-linux         |          []         []                         |
+     ve                 |          []         []                     []  |
+     vice               |                                                |
+     vmm                |                                                |
+     vorbis-tools       |          []                          []    []  |
+     wastesedge         |                                                |
+     wcd                |                                                |
+     wcd-man            |                                                |
+     wdiff              |          []         []      []       []    []  |
+     wget               |          []         []      []    []       []  |
+     wyslij-po          | []       []         []                     []  |
+     xboard             |          []                 []             []  |
+     xdg-user-dirs      | [] [] [] []  [] []  []   [] []    [] [] [] []  |
+     xkeyboard-config   |          []         []      []       []        |
+                        +------------------------------------------------+
+                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
+                           7  3  6 114  1 12  88   32 82  3 40 45  7 101
 
-                          sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
-                        +---------------------------------------------------+
-     a2ps               | []             [] [] []     []                    |
-     aegis              |                             []                    |
-     anubis             | []                [] []     []                    |
-     aspell             |                      []     []  []     []         |
-     bash               | []                   []     []         []         |
-     bfd                |                      []     []                    |
-     binutils           | []                   []     []                    |
-     bison              | []                   []     []         []         |
-     bison-runtime      | []             [] [] []     []         []         |
-     buzztrax           | []                          []         []         |
-     ccd2cue            |                      []     []         []         |
-     ccide              | []                   []     []         []         |
-     cflow              | []                   []     []         []         |
-     clisp              |                                                   |
-     coreutils          | []                   []     []         []         |
-     cpio               | []                [] []     []         []         |
-     cppi               | []                   []     []         []         |
-     cpplib             | []                [] []     []         []         |
-     cryptsetup         |                      []     []         []         |
-     datamash           | []                   []     []                    |
-     denemo             |                                                   |
-     dfarc              |                             []                    |
-     dialog             | [] []          []           []  []     []         |
-     dico               |                      []                           |
-     diffutils          | []                [] []     []         []         |
-     dink               |                                                   |
-     direvent           |                      []     []                    |
-     doodle             | []                          []                    |
-     dos2unix           | []                   []     []         []         |
-     dos2unix-man       | []                   []                []         |
-     e2fsprogs          | []                   []     []         []         |
-     enscript           | []                [] []     []                    |
-     exif               | []                [] []     []         []         |
-     fetchmail          | []                []        []         []         |
-     findutils          | []                [] []     []         []         |
-     flex               | []                []        []         []         |
-     freedink           |                []           []                    |
-     fusionforge        |                                                   |
-     gas                |                      []                           |
-     gawk               | []                          []                    |
-     gcal               | []                []                              |
-     gcc                | []                                     []         |
-     gdbm               |                      []     []                    |
-     gettext-examples   | []                [] []     []         []    []   |
-     gettext-runtime    | []                [] []     []         []    []   |
-     gettext-tools      | []                [] []     []         []         |
-     gjay               |                []           []                    |
-     glunarclock        | []                          []  []     []         |
-     gnubiff            | []                          []                    |
-     gnubik             | []                   []     []         []         |
-     gnucash            |       () ()              () ()         []         |
-     gnuchess           |                      []     []                    |
-     gnulib             | []                   []     []         []         |
-     gnunet             |                                                   |
-     gnunet-gtk         |                                                   |
-     gold               |                      []     []                    |
-     gphoto2            | []                   []     []         []         |
-     gprof              | []                [] []     []                    |
-     gramadoir          | []                          []         []         |
-     grep               | []             []    []     []         []         |
-     grub               | []                [] []     []                    |
-     gsasl              | []                   []     []         []         |
-     gss                | []                          []         []         |
-     gst-plugins-bad    | []                   []     []         []         |
-     gst-plugins-base   | []                [] []     []         []         |
-     gst-plugins-good   | []                [] []     []         []         |
-     gst-plugins-ugly   | []                [] []     []         []         |
-     gstreamer          | []                [] []     []         []         |
-     gtick              |                      []     []         []         |
-     gtkam              | []                   []     []         []         |
-     gtkspell           | []             [] [] []     []  []     []    []   |
-     guix               |                             []                    |
-     guix-packages      |                                                   |
-     gutenprint         |                   [] []     []         []         |
-     hello              | []             [] [] []     []         []         |
-     help2man           |                      []     []         []         |
-     help2man-texi      |                      []                           |
-     hylafax            |                             []                    |
-     idutils            |                      []     []         []         |
-     iso_15924          | []             () [] []     ()         []         |
-     iso_3166           | []       []    () [] []     ()  []     []    []   |
-     iso_3166_2         |                () [] []     ()         []         |
-     iso_4217           | []             () [] []     ()         []    []   |
-     iso_639            | []    [] []    () [] []     ()  []     []    []   |
-     iso_639_3          |       []       () [] []     ()                    |
-     iso_639_5          |                ()    []     ()                    |
-     jwhois             | []                []        []         []         |
-     kbd                |                      []     []         []         |
-     klavaro            | []                   []  [] []     []  []         |
-     latrine            |                             []         []         |
-     ld                 | []                [] []     []         []         |
-     leafpad            | []             [] [] []     []         []         |
-     libc               | []                [] []     []         []         |
-     libexif            |                             []         ()         |
-     libextractor       |                      []     []                    |
-     libgnutls          | []                   []     []         []         |
-     libgphoto2         |                      []     []                    |
-     libgphoto2_port    | []                   []     []         []         |
-     libgsasl           | []                   []     []         []         |
-     libiconv           | []                   []     []  []     []         |
-     libidn             | ()                   []     []         []         |
-     liferea            | []                [] []     []         []         |
-     lilypond           |                             []                    |
-     lordsawar          |                                                   |
-     lprng              |                             []                    |
-     lynx               | []                [] []     []                    |
-     m4                 | []                          []         []         |
-     mailfromd          |                      []     []                    |
-     mailutils          |                             []                    |
-     make               | []                   []     []         []         |
-     man-db             |                             []         []         |
-     man-db-manpages    |                                        []         |
-     midi-instruments   | []             [] [] []     []         []         |
-     minicom            | []                          []                    |
-     mkisofs            |                      []     []         []         |
-     myserver           |                             []                    |
-     nano               | []                   []     []         []         |
-     opcodes            |                      []     []         []         |
-     parted             | []                [] []     []         []         |
-     pies               |                      []     []                    |
-     popt               | []    []       [] [] []     []         []         |
-     procps-ng          |                      []     []                    |
-     procps-ng-man      |                      []                           |
-     psmisc             | []                   []     []         []         |
-     pspp               |                   [] []                []         |
-     pushover           | []                                                |
-     pwdutils           | []                          []                    |
-     pyspread           |                      []                           |
-     radius             |                      []     []                    |
-     recode             | []                []        []         []         |
-     recutils           | []                   []     []                    |
-     rpm                | []                   []     []         []         |
-     rush               |                      []     []                    |
-     sarg               |                                                   |
-     sed                | []                [] []     []         []         |
-     sharutils          |                      []     []         []         |
-     shishi             |                             []         []         |
-     skribilo           | []                                                |
-     solfege            |                   []        []         []         |
-     solfege-manual     |                   []                              |
-     spotmachine        | []                   []     []                    |
-     sudo               |                   [] []     []         []         |
-     sudoers            |                      []     []         []         |
-     sysstat            | []                [] []     []         []         |
-     tar                | []                [] []     []         []         |
-     texinfo            |                   [] []     []                    |
-     texinfo_document   |                      []                           |
-     tigervnc           | []                   []                           |
-     tin                |                                        []         |
-     tin-man            |                                                   |
-     tracgoogleappsa... | []             []    []     []         []         |
-     trader             | []                                                |
-     util-linux         |                      []     []         []         |
-     ve                 | []                   []     []         []         |
-     vice               | ()                ()                              |
-     vmm                |                                                   |
-     vorbis-tools       | []                          []                    |
-     wastesedge         |                                                   |
-     wcd                |                      []     []         []         |
-     wcd-man            |                      []                           |
-     wdiff              | []                   []     []         []         |
-     wget               |                      []     []         []         |
-     wyslij-po          |                      []     []                    |
-     xboard             |                      []                           |
-     xdg-user-dirs      | []    [] []    [] [] []     []         []    []   |
-     xkeyboard-config   | []                [] []     []                    |
-                        +---------------------------------------------------+
-                          sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
-                          91  1  4  3  0 13 50 113  1 126  7  1  95     7
+                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
+                        +----------------------------------------------+
+     a2ps               | []              [] [] []     []              |
+     aegis              |                              []              |
+     anubis             | []                 [] []     []              |
+     aspell             | []                    []     []  []     []   |
+     bash               | []                    []     []         []   |
+     bfd                | []                    []     []              |
+     binutils           | []                    []     []              |
+     bison              | []                    []     []         []   |
+     bison-runtime      | []              [] [] []     []         []   |
+     buzztrax           | []                           []         []   |
+     ccd2cue            |                       []     []         []   |
+     ccide              | []                    []     []         []   |
+     cflow              | []                    []     []         []   |
+     clisp              |                                              |
+     coreutils          | []                    []     []              |
+     cpio               | []                 [] []     []         []   |
+     cppi               | []                    []     []         []   |
+     cpplib             | []                 [] []     []         []   |
+     cryptsetup         |                       []     []         []   |
+     datamash           | []                    []     []              |
+     denemo             |                                         []   |
+     dfarc              | []                           []              |
+     dialog             | []  []          []           []  []     []   |
+     dico               |                       []                     |
+     diffutils          | []                 [] []     []         []   |
+     dink               | []                                           |
+     direvent           |                       []     []              |
+     doodle             | []                           []              |
+     dos2unix           | []                    []     []         []   |
+     dos2unix-man       | []                    []                []   |
+     e2fsprogs          | []                    []     []         []   |
+     enscript           | []                 [] []     []              |
+     exif               | []                 [] []     []         []   |
+     fetchmail          | []                 []        []         []   |
+     findutils          | []                 [] []     []         []   |
+     flex               | []                 []        []         []   |
+     freedink           | []              []           []              |
+     fusionforge        |                                              |
+     gas                |                       []                     |
+     gawk               | []                           []         []   |
+     gcal               | []                 []                   []   |
+     gcc                | []                                           |
+     gdbm               |                       []     []              |
+     gettext-examples   | []                 [] []     []         []   |
+     gettext-runtime    | []                 [] []     []         []   |
+     gettext-tools      | []                 [] []     []         []   |
+     gjay               |                 []           []         []   |
+     glunarclock        | []                           []  []     []   |
+     gnubiff            | []                           []              |
+     gnubik             | []                    []     []         []   |
+     gnucash            |        () ()              () ()         []   |
+     gnuchess           |                       []     []         []   |
+     gnulib             | []                    []     []         []   |
+     gnunet             |                                              |
+     gnunet-gtk         |                                              |
+     gold               |                       []     []              |
+     gphoto2            | []                    []     []         []   |
+     gprof              | []                 [] []     []              |
+     gramadoir          | []                           []         []   |
+     grep               | []              []    []     []         []   |
+     grub               | []                 [] []     []              |
+     gsasl              | []                    []     []         []   |
+     gss                | []                           []         []   |
+     gst-plugins-bad    | []                 [] []     []         []   |
+     gst-plugins-base   | []                 [] []     []         []   |
+     gst-plugins-good   | []                 [] []     []         []   |
+     gst-plugins-ugly   | []                 [] []     []         []   |
+     gstreamer          | []                 [] []     []         []   |
+     gtick              |                       []     []         []   |
+     gtkam              | []                    []     []         []   |
+     gtkspell           | []              [] [] []     []  []     []   |
+     guix               |                                              |
+     guix-packages      |                                              |
+     gutenprint         |                    [] []     []         []   |
+     hello              | []              [] [] []     []         []   |
+     help2man           |                       []     []         []   |
+     help2man-texi      |                       []                     |
+     hylafax            |                              []              |
+     idutils            |                       []     []         []   |
+     iso_15924          | []              () [] []     ()         []   |
+     iso_3166           | []        []    () [] []     ()  []     []   |
+     iso_3166_2         |                 () [] []     ()         []   |
+     iso_4217           | []              () [] []     ()         []   |
+     iso_639            | []     [] []    () [] []     ()  []     []   |
+     iso_639_3          |        []       () [] []     ()              |
+     iso_639_5          |                 ()    []     ()              |
+     jwhois             | []                 []        []         []   |
+     kbd                | []                    []     []         []   |
+     klavaro            | []                    []  [] []     []  []   |
+     ld                 | []                 [] []     []         []   |
+     leafpad            | []              [] [] []     []         []   |
+     libc               | []                 [] []     []         []   |
+     libexif            | []                           []         ()   |
+     libextractor       |                       []     []              |
+     libgnutls          | []                    []     []         []   |
+     libgphoto2         | []                    []     []              |
+     libgphoto2_port    | []                    []     []         []   |
+     libgsasl           | []                    []     []         []   |
+     libiconv           | []                    []     []  []     []   |
+     libidn             | ()                    []     []         []   |
+     liferea            | []                 [] []     []         []   |
+     lilypond           |                              []              |
+     lordsawar          |                                              |
+     lprng              |                              []              |
+     lynx               | []                 [] []     []              |
+     m4                 | []                           []         []   |
+     mailfromd          |                       []     []              |
+     mailutils          |                              []              |
+     make               | []                    []     []         []   |
+     man-db             | []                           []         []   |
+     man-db-manpages    | []                                      []   |
+     midi-instruments   | []              [] [] []     []         []   |
+     minicom            | []                           []              |
+     mkisofs            |                       []     []         []   |
+     myserver           |                              []              |
+     nano               | []                    []     []         []   |
+     opcodes            |                       []     []         []   |
+     parted             | []                 [] []     []         []   |
+     pies               |                       []     []              |
+     pnmixer            |                       []     []         []   |
+     popt               | []     []       [] [] []     []         []   |
+     procps-ng          |                       []     []              |
+     procps-ng-man      |                       []                     |
+     psmisc             | []                    []     []         []   |
+     pspp               |                    [] []                []   |
+     pushover           | []                                           |
+     pwdutils           | []                           []              |
+     pyspread           |                       []                     |
+     radius             |                       []     []              |
+     recode             | []                 []        []         []   |
+     recutils           | []                    []     []              |
+     rpm                | []                    []     []         []   |
+     rush               |                       []     []              |
+     sarg               |                                              |
+     sed                | []                 [] []     []         []   |
+     sharutils          | []                    []     []         []   |
+     shishi             |                              []         []   |
+     skribilo           | []                    []                     |
+     solfege            | []                 []        []         []   |
+     solfege-manual     |                    []                        |
+     spotmachine        | []                    []     []              |
+     sudo               | []                 [] []     []         []   |
+     sudoers            | []                    []     []         []   |
+     sysstat            | []                 [] []     []         []   |
+     tar                | []                 [] []     []         []   |
+     texinfo            |                    [] []     []              |
+     texinfo_document   |                       []                     |
+     tigervnc           | []                    []                []   |
+     tin                |                                         []   |
+     tin-man            |                                              |
+     tracgoogleappsa... | []              []    []     []         []   |
+     trader             | []                                           |
+     util-linux         | []                    []     []         []   |
+     ve                 | []                    []     []         []   |
+     vice               | ()                 ()                        |
+     vmm                |                                              |
+     vorbis-tools       | []                           []              |
+     wastesedge         |                                              |
+     wcd                |                       []     []         []   |
+     wcd-man            |                       []                     |
+     wdiff              | []                    []     []         []   |
+     wget               |                       []     []         []   |
+     wyslij-po          |                       []     []              |
+     xboard             |                       []                []   |
+     xdg-user-dirs      | []     [] []    [] [] []     []         []   |
+     xkeyboard-config   | []                 [] []     []              |
+                        +----------------------------------------------+
+                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
+                          106  1  4  3  0 13 51 115  1 125  7  1  100 
 
-                          zh_TW
-                        +-------+
-     a2ps               |       | 30
-     aegis              |       |  9
-     anubis             |       | 19
-     aspell             |       | 28
-     bash               |  []   | 21
-     bfd                |       |  9
-     binutils           |       | 12
-     bison              |  []   | 18
-     bison-runtime      |  []   | 38
-     buzztrax           |       |  8
-     ccd2cue            |       |  8
-     ccide              |       | 17
-     cflow              |       | 15
-     clisp              |       | 10
-     coreutils          |       | 20
-     cpio               |       | 20
-     cppi               |       | 17
-     cpplib             |  []   | 19
-     cryptsetup         |       | 13
-     datamash           |       | 11
-     denemo             |       |  4
-     dfarc              |       | 16
-     dialog             |  []   | 42
-     dico               |       |  6
-     diffutils          |       | 21
-     dink               |       |  9
-     direvent           |       | 10
-     doodle             |       | 12
-     dos2unix           |  []   | 18
-     dos2unix-man       |       |  9
-     e2fsprogs          |       | 14
-     enscript           |       | 21
-     exif               |       | 26
-     fetchmail          |       | 19
-     findutils          |       | 28
-     flex               |  []   | 19
-     freedink           |       | 23
-     fusionforge        |       |  3
-     gas                |       |  5
-     gawk               |       | 12
-     gcal               |       |  7
-     gcc                |       |  4
-     gdbm               |       | 10
-     gettext-examples   |  []   | 40
-     gettext-runtime    |  []   | 34
-     gettext-tools      |  []   | 24
-     gjay               |       |  8
-     glunarclock        |  []   | 27
-     gnubiff            |       |  9
-     gnubik             |       | 19
-     gnucash            |  ()   |  7
-     gnuchess           |       | 10
-     gnulib             |       | 23
-     gnunet             |       |  1
-     gnunet-gtk         |       |  1
-     gold               |       |  7
-     gphoto2            |  []   | 19
-     gprof              |       | 21
-     gramadoir          |       | 14
-     grep               |  []   | 31
-     grub               |       | 21
-     gsasl              |  []   | 19
-     gss                |       | 17
-     gst-plugins-bad    |       | 14
-     gst-plugins-base   |       | 27
-     gst-plugins-good   |       | 32
-     gst-plugins-ugly   |       | 34
-     gstreamer          |  []   | 31
-     gtick              |       | 19
-     gtkam              |       | 24
-     gtkspell           |  []   | 48
-     guix               |       |  3
-     guix-packages      |       |  0
-     gutenprint         |       | 15
-     hello              |  []   | 30
-     help2man           |       | 18
-     help2man-texi      |       |  5
-     hylafax            |       |  5
-     idutils            |       | 14
-     iso_15924          |  []   | 23
-     iso_3166           |  []   | 58
-     iso_3166_2         |       |  9
-     iso_4217           |  []   | 28
-     iso_639            |  []   | 46
-     iso_639_3          |       | 10
-     iso_639_5          |       |  2
-     jwhois             |  []   | 20
-     kbd                |       | 16
-     klavaro            |       | 30
-     latrine            |       |  7
-     ld                 |  []   | 15
-     leafpad            |  []   | 40
-     libc               |  []   | 24
-     libexif            |       |  9
-     libextractor       |       |  5
-     libgnutls          |       | 13
-     libgphoto2         |       |  9
-     libgphoto2_port    |  []   | 19
-     libgsasl           |       | 18
-     libiconv           |  []   | 29
-     libidn             |       | 17
-     liferea            |       | 29
-     lilypond           |       | 11
-     lordsawar          |       |  3
-     lprng              |       |  3
-     lynx               |       | 19
-     m4                 |  []   | 22
-     mailfromd          |       |  4
-     mailutils          |       |  6
-     make               |       | 19
-     man-db             |       | 14
-     man-db-manpages    |       |  9
-     midi-instruments   |  []   | 43
-     minicom            |  []   | 17
-     mkisofs            |       | 13
-     myserver           |       |  9
-     nano               |  []   | 29
-     opcodes            |       | 12
-     parted             |  []   | 21
-     pies               |       |  4
-     popt               |  []   | 36
-     procps-ng          |       |  5
-     procps-ng-man      |       |  4
-     psmisc             |  []   | 22
-     pspp               |       | 13
-     pushover           |       |  6
-     pwdutils           |       |  8
-     pyspread           |       |  6
-     radius             |       |  9
-     recode             |       | 31
-     recutils           |       |  9
-     rpm                |  []   | 13
-     rush               |       | 10
-     sarg               |       |  4
-     sed                |  []   | 34
-     sharutils          |       | 12
-     shishi             |       |  7
-     skribilo           |       |  4
-     solfege            |       | 19
-     solfege-manual     |       |  9
-     spotmachine        |       | 10
-     sudo               |       | 24
-     sudoers            |       | 20
-     sysstat            |       | 22
-     tar                |  []   | 30
-     texinfo            |       | 17
-     texinfo_document   |       | 11
-     tigervnc           |       | 11
-     tin                |  []   |  7
-     tin-man            |       |  1
-     tracgoogleappsa... |  []   | 22
-     trader             |       | 11
-     util-linux         |       | 12
-     ve                 |       | 14
-     vice               |       |  1
-     vmm                |       |  3
-     vorbis-tools       |       | 13
-     wastesedge         |       |  2
-     wcd                |       |  8
-     wcd-man            |       |  3
-     wdiff              |  []   | 23
-     wget               |       | 19
-     wyslij-po          |       | 14
-     xboard             |       |  9
-     xdg-user-dirs      |  []   | 68
-     xkeyboard-config   |  []   | 27
-                        +-------+
-       90 teams           zh_TW
-      166 domains          42    2748
+                          zh_HK zh_TW
+                        +-------------+
+     a2ps               |             | 30
+     aegis              |             |  9
+     anubis             |             | 19
+     aspell             |             | 29
+     bash               |        []   | 23
+     bfd                |             | 11
+     binutils           |             | 12
+     bison              |        []   | 18
+     bison-runtime      |        []   | 38
+     buzztrax           |             |  9
+     ccd2cue            |             | 10
+     ccide              |             | 17
+     cflow              |             | 16
+     clisp              |             | 10
+     coreutils          |             | 18
+     cpio               |             | 20
+     cppi               |             | 17
+     cpplib             |        []   | 19
+     cryptsetup         |             | 14
+     datamash           |             | 11
+     denemo             |             |  5
+     dfarc              |             | 17
+     dialog             |        []   | 42
+     dico               |             |  6
+     diffutils          |             | 22
+     dink               |             | 10
+     direvent           |             | 11
+     doodle             |             | 12
+     dos2unix           |        []   | 18
+     dos2unix-man       |             |  9
+     e2fsprogs          |             | 15
+     enscript           |             | 21
+     exif               |             | 27
+     fetchmail          |             | 19
+     findutils          |             | 29
+     flex               |        []   | 19
+     freedink           |             | 24
+     fusionforge        |             |  3
+     gas                |             |  5
+     gawk               |             | 13
+     gcal               |             |  8
+     gcc                |             |  2
+     gdbm               |             | 10
+     gettext-examples   |  []    []   | 40
+     gettext-runtime    |  []    []   | 35
+     gettext-tools      |        []   | 24
+     gjay               |             |  9
+     glunarclock        |        []   | 27
+     gnubiff            |             |  9
+     gnubik             |             | 19
+     gnucash            |        ()   |  6
+     gnuchess           |             | 11
+     gnulib             |             | 23
+     gnunet             |             |  1
+     gnunet-gtk         |             |  1
+     gold               |             |  7
+     gphoto2            |        []   | 19
+     gprof              |             | 21
+     gramadoir          |             | 14
+     grep               |        []   | 31
+     grub               |             | 21
+     gsasl              |        []   | 19
+     gss                |             | 17
+     gst-plugins-bad    |             | 21
+     gst-plugins-base   |             | 27
+     gst-plugins-good   |             | 32
+     gst-plugins-ugly   |             | 34
+     gstreamer          |        []   | 32
+     gtick              |             | 19
+     gtkam              |             | 24
+     gtkspell           |  []    []   | 48
+     guix               |             |  2
+     guix-packages      |             |  0
+     gutenprint         |             | 15
+     hello              |        []   | 30
+     help2man           |             | 18
+     help2man-texi      |             |  5
+     hylafax            |             |  5
+     idutils            |             | 14
+     iso_15924          |        []   | 23
+     iso_3166           |  []    []   | 58
+     iso_3166_2         |             |  9
+     iso_4217           |  []    []   | 28
+     iso_639            |  []    []   | 46
+     iso_639_3          |             | 10
+     iso_639_5          |             |  2
+     jwhois             |        []   | 20
+     kbd                |             | 17
+     klavaro            |             | 30
+     ld                 |        []   | 15
+     leafpad            |        []   | 39
+     libc               |        []   | 24
+     libexif            |             | 10
+     libextractor       |             |  5
+     libgnutls          |             | 13
+     libgphoto2         |             | 10
+     libgphoto2_port    |        []   | 19
+     libgsasl           |             | 18
+     libiconv           |        []   | 29
+     libidn             |             | 17
+     liferea            |             | 29
+     lilypond           |             | 11
+     lordsawar          |             |  3
+     lprng              |             |  3
+     lynx               |             | 19
+     m4                 |        []   | 22
+     mailfromd          |             |  4
+     mailutils          |             |  6
+     make               |             | 19
+     man-db             |             | 15
+     man-db-manpages    |             | 10
+     midi-instruments   |        []   | 43
+     minicom            |        []   | 17
+     mkisofs            |             | 13
+     myserver           |             |  9
+     nano               |        []   | 30
+     opcodes            |             | 12
+     parted             |        []   | 23
+     pies               |             |  4
+     pnmixer            |             |  9
+     popt               |        []   | 36
+     procps-ng          |             |  5
+     procps-ng-man      |             |  4
+     psmisc             |        []   | 22
+     pspp               |             | 13
+     pushover           |             |  6
+     pwdutils           |             |  8
+     pyspread           |             |  6
+     radius             |             |  9
+     recode             |             | 31
+     recutils           |             | 10
+     rpm                |        []   | 13
+     rush               |             | 10
+     sarg               |             |  4
+     sed                |        []   | 35
+     sharutils          |             | 13
+     shishi             |             |  7
+     skribilo           |             |  7
+     solfege            |             | 21
+     solfege-manual     |             |  9
+     spotmachine        |             | 11
+     sudo               |             | 26
+     sudoers            |             | 22
+     sysstat            |             | 23
+     tar                |        []   | 30
+     texinfo            |             | 17
+     texinfo_document   |             | 13
+     tigervnc           |             | 14
+     tin                |        []   |  7
+     tin-man            |             |  1
+     tracgoogleappsa... |        []   | 22
+     trader             |             | 12
+     util-linux         |             | 13
+     ve                 |             | 14
+     vice               |             |  1
+     vmm                |             |  3
+     vorbis-tools       |             | 13
+     wastesedge         |             |  3
+     wcd                |             |  8
+     wcd-man            |             |  3
+     wdiff              |        []   | 23
+     wget               |             | 21
+     wyslij-po          |             | 14
+     xboard             |             | 10
+     xdg-user-dirs      |  []    []   | 68
+     xkeyboard-config   |        []   | 28
+                        +-------------+
+       89 teams           zh_HK zh_TW
+      166 domains           7    42    2809
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 5aa6d30..e69de29 100644
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,11 +0,0 @@
-No more ChangeLog files
-========================
-Do not modify any of the ChangeLog files in gettext.  Starting on
-October 14th, 2015 we put changelog information only in the git commit
-log, and generate a top-level ChangeLog file from logs at "make dist"
-time.
-
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 57350f7..86df1b3 100644
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime directory of GNU gettext
-## Copyright (C) 1995-2006, 2010, 2012, 2015 Free Software Foundation,
+## Copyright (C) 1995-2006, 2010, 2012, 2015-2016 Free Software Foundation,
 ## Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/Makefile.in b/gettext-runtime/Makefile.in
index ce46145..ba8134c 100644
--- a/gettext-runtime/Makefile.in
+++ b/gettext-runtime/Makefile.in
@@ -109,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-runtime/aclocal.m4 b/gettext-runtime/aclocal.m4
index f949507..57acc5d 100644
--- a/gettext-runtime/aclocal.m4
+++ b/gettext-runtime/aclocal.m4
@@ -1230,6 +1230,7 @@ m4_include([gnulib-m4/getopt.m4])
 m4_include([gnulib-m4/gettimeofday.m4])
 m4_include([gnulib-m4/gnulib-common.m4])
 m4_include([gnulib-m4/gnulib-comp.m4])
+m4_include([gnulib-m4/hard-locale.m4])
 m4_include([gnulib-m4/iconv_h.m4])
 m4_include([gnulib-m4/iconv_open.m4])
 m4_include([gnulib-m4/include_next.m4])
diff --git a/gettext-runtime/config.h.in b/gettext-runtime/config.h.in
index cccfc8e..256fc80 100644
--- a/gettext-runtime/config.h.in
+++ b/gettext-runtime/config.h.in
@@ -29,6 +29,9 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
+/* Define to 1 if the C locale may have encoding errors. */
+#undef C_LOCALE_MAYBE_EILSEQ
+
 /* Define to 1 if // is a file system root distinct from /. */
 #undef DOUBLE_SLASH_IS_DISTINCT_ROOT
 
@@ -1409,6 +1412,12 @@
    used. */
 #undef __GETOPT_PREFIX
 
+/* Define to 1 if the system <stdint.h> predates C++11. */
+#undef __STDC_CONSTANT_MACROS
+
+/* Define to 1 if the system <stdint.h> predates C++11. */
+#undef __STDC_LIMIT_MACROS
+
 /* Please see the Gnulib manual for how to use these macros.
 
    Suppress extern inline with HP-UX cc, as it appears to be broken; see
@@ -1455,6 +1464,7 @@
       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
       : (199901L <= __STDC_VERSION__ \
          && !defined __HP_cc \
+         && !defined __PGI \
          && !(defined __SUNPRO_C && __STDC__))) \
      && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
 # define _GL_INLINE inline
diff --git a/gettext-runtime/configure b/gettext-runtime/configure
index 67d2913..f3968e1 100755
--- a/gettext-runtime/configure
+++ b/gettext-runtime/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gettext-runtime 0.19.7.
+# Generated by GNU Autoconf 2.69 for gettext-runtime 0.19.8.1.
 #
 # Report bugs to <bug-gnu-gettext@gnu.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gettext-runtime'
 PACKAGE_TARNAME='gettext-runtime'
-PACKAGE_VERSION='0.19.7'
-PACKAGE_STRING='gettext-runtime 0.19.7'
+PACKAGE_VERSION='0.19.8.1'
+PACKAGE_STRING='gettext-runtime 0.19.8.1'
 PACKAGE_BUGREPORT='bug-gnu-gettext@gnu.org'
 PACKAGE_URL=''
 
@@ -2159,7 +2159,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gettext-runtime 0.19.7 to adapt to many kinds of systems.
+\`configure' configures gettext-runtime 0.19.8.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2230,7 +2230,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gettext-runtime 0.19.7:";;
+     short | recursive ) echo "Configuration of gettext-runtime 0.19.8.1:";;
    esac
   cat <<\_ACEOF
 
@@ -2369,7 +2369,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gettext-runtime configure 0.19.7
+gettext-runtime configure 0.19.8.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3021,7 +3021,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gettext-runtime $as_me 0.19.7, which was
+It was created by gettext-runtime $as_me 0.19.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3920,7 +3920,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gettext-runtime'
- VERSION='0.19.7'
+ VERSION='0.19.8.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7192,6 +7192,7 @@ fi
   # Code from module gettext-runtime-misc:
   # Code from module gettimeofday:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module havelib:
   # Code from module iconv:
   # Code from module iconv-h:
@@ -16337,7 +16338,7 @@ static void
 sigfpe_handler (int sig)
 {
   /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
+  _exit (sig != SIGFPE);
 }
 
 int x = 1;
@@ -19802,16 +19803,21 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -20305,20 +20311,25 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -20337,20 +20348,25 @@ rm -f core conftest.err conftest.$ac_objext \
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -20795,11 +20811,12 @@ nocrash_init (void)
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
+#include <unistd.h>
 /* A POSIX signal handler.  */
 static void
 exception_handler (int sig)
 {
-  exit (1);
+  _exit (1);
 }
 static void
 nocrash_init (void)
@@ -20825,22 +20842,27 @@ main ()
           char *name = realpath ("conftest.a", NULL);
           if (!(name && *name == '/'))
             result |= 1;
+          free (name);
         }
         {
           char *name = realpath ("conftest.b/../conftest.a", NULL);
           if (name != NULL)
             result |= 2;
+          free (name);
         }
         {
           char *name = realpath ("conftest.a/", NULL);
           if (name != NULL)
             result |= 4;
+          free (name);
         }
         {
           char *name1 = realpath (".", NULL);
           char *name2 = realpath ("conftest.d//./..", NULL);
-          if (strcmp (name1, name2) != 0)
+          if (! (name1 && name2 && strcmp (name1, name2) != 0))
             result |= 8;
+          free (name1);
+          free (name2);
         }
         return result;
 
@@ -22061,11 +22083,12 @@ nocrash_init (void)
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
+#include <unistd.h>
 /* A POSIX signal handler.  */
 static void
 exception_handler (int sig)
 {
-  exit (1);
+  _exit (1);
 }
 static void
 nocrash_init (void)
@@ -24112,6 +24135,21 @@ $as_echo "$gl_cv_func_memchr_works" >&6; }
 
 
 
+
+  if test $ac_cv_func__set_invalid_parameter_handler = yes; then
+    HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
+
+$as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
+
+  else
+    HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
+  fi
+
+
+
+
+
+
     gl_cv_c_multiarch=no
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -24565,7 +24603,7 @@ EOF
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
-     if grep _foo conftest.$gl_asmext >/dev/null ; then
+     if LC_ALL=C grep -E '(^|^a-zA-Z0-9_)_foo(^a-zA-Z0-9_|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
      else
        gl_cv_prog_as_underscore=no
@@ -24815,6 +24853,8 @@ else
 
 
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
 #if !(defined WCHAR_MIN && defined WCHAR_MAX)
@@ -24983,6 +25023,8 @@ else
 
 
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 
 
@@ -25069,6 +25111,58 @@ fi
 $as_echo "$gl_cv_header_working_stdint_h" >&6; }
   fi
   if test "$gl_cv_header_working_stdint_h" = yes; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5
+$as_echo_n "checking whether stdint.h predates C++11... " >&6; }
+if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_stdint_predates_cxx11_h=yes
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_stdint_predates_cxx11_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5
+$as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; }
+
+    if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+
+$as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+
+
+$as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
+
+    fi
     STDINT_H=
   else
             for ac_header in sys/inttypes.h sys/bitypes.h
@@ -27166,6 +27260,9 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
 
 
 
+  :
+
+
 
 
 
@@ -28714,6 +28811,60 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
 $as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5
+$as_echo_n "checking whether the C locale is free of encoding errors... " >&6; }
+if ${gl_cv_C_locale_sans_EILSEQ+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+               gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+
+int
+main ()
+{
+
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 1;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 1;
+              }
+            return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_C_locale_sans_EILSEQ=yes
+else
+  gl_cv_C_locale_sans_EILSEQ=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5
+$as_echo "$gl_cv_C_locale_sans_EILSEQ" >&6; }
+
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *)
@@ -28754,6 +28905,14 @@ $as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *)
+$as_echo "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 
@@ -29124,17 +29283,6 @@ done
 
   fi
 
-
-  if test $ac_cv_func__set_invalid_parameter_handler = yes; then
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
-
-$as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
-
-  else
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
-  fi
-
-
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
 
 
@@ -29148,8 +29296,6 @@ $as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
 
   fi
 
-
-
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
 
 
@@ -31706,7 +31852,7 @@ _ACEOF
 
   if test $ac_cv_func_wcwidth = yes; then
     HAVE_WCWIDTH=1
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
 $as_echo_n "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; }
 if ${gl_cv_func_wcwidth_works+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -31753,6 +31899,8 @@ int main ()
         result |= 2;
       if (wcwidth (0x200B) > 0)
         result |= 4;
+      if (wcwidth (0xFF1A) == 0)
+        result |= 8;
     }
   return result;
 }
@@ -33094,7 +33242,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gettext-runtime $as_me 0.19.7, which was
+This file was extended by gettext-runtime $as_me 0.19.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -33160,7 +33308,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gettext-runtime config.status 0.19.7
+gettext-runtime config.status 0.19.8.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 77e954b..71adec3 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-runtime directory of GNU gettext
-dnl Copyright (C) 1995-2010, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2010, 2015-2016 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
diff --git a/gettext-runtime/doc/Makefile.am b/gettext-runtime/doc/Makefile.am
index 63a016b..11c0340 100644
--- a/gettext-runtime/doc/Makefile.am
+++ b/gettext-runtime/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/doc subdirectory of GNU gettext
-## Copyright (C) 1995-1997, 2001-2003, 2006, 2015 Free Software
+## Copyright (C) 1995-1997, 2001-2003, 2006, 2015-2016 Free Software
 ## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/doc/Makefile.in b/gettext-runtime/doc/Makefile.in
index 1bd7a58..053d658 100644
--- a/gettext-runtime/doc/Makefile.in
+++ b/gettext-runtime/doc/Makefile.in
@@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-runtime/doc/matrix.texi b/gettext-runtime/doc/matrix.texi
index 3767d49..6fd3afc 100644
--- a/gettext-runtime/doc/matrix.texi
+++ b/gettext-runtime/doc/matrix.texi
@@ -65,7 +65,7 @@ grep               |                          []             []     [] |
 grub               |                                         []        |
 gsasl              |                                                   |
 gss                |                                                   |
-gst-plugins-bad    |                                                [] |
+gst-plugins-bad    |                          []                    [] |
 gst-plugins-base   |                          []             []     [] |
 gst-plugins-good   |                          []             []     [] |
 gst-plugins-ugly   |                          []             []     [] |
@@ -91,7 +91,6 @@ iso_639_5          |                                                   |
 jwhois             |                                                   |
 kbd                |                                                [] |
 klavaro            |          []              [] []          []     [] |
-latrine            |                                                   |
 ld                 |                          []                       |
 leafpad            |                       [] []             []     [] |
 libc               |                          []             []     [] |
@@ -122,6 +121,7 @@ nano               |                          []             []     [] |
 opcodes            |                                                   |
 parted             |                                                [] |
 pies               |                                                   |
+pnmixer            |                                                   |
 popt               |                                                [] |
 procps-ng          |                                                   |
 procps-ng-man      |                                                   |
@@ -136,11 +136,11 @@ recutils           |                                                   |
 rpm                |                                                   |
 rush               |                                                   |
 sarg               |                                                   |
-sed                |                []                       []     [] |
+sed                |                []        []             []     [] |
 sharutils          |                                                [] |
 shishi             |                                                   |
 skribilo           |                                                   |
-solfege            |                                                [] |
+solfege            |                                         []     [] |
 solfege-manual     |                                                   |
 spotmachine        |                                                   |
 sudo               |                                         []     [] |
@@ -148,7 +148,7 @@ sudoers            |                                         []     [] |
 sysstat            |                                                [] |
 tar                |                          []             []     [] |
 texinfo            |                                         []     [] |
-texinfo_document   |                                         []        |
+texinfo_document   |                                         []     [] |
 tigervnc           |                          []                       |
 tin                |                                                   |
 tin-man            |                                                   |
@@ -170,7 +170,7 @@ xdg-user-dirs      | []    []    [] []     [] []     []      [] []  [] |
 xkeyboard-config   |                          []             []     [] |
                    +---------------------------------------------------+
                      af am an ar as ast az be bg bn bn_IN bs ca crh cs
-                      4  0  2  5  3 11   0  8 23  3   3    1 54  4  73
+                      4  0  2  5  3 11   0  8 25  3   3    1 55  4  74
 @end group
 
 @group
@@ -186,7 +186,7 @@ binutils           |                              []          []  []  |
 bison              | []  []  []                [] [] []       []  []  |
 bison-runtime      | []  []  []                [] [] []       []  []  |
 buzztrax           | []  []                                   []  []  |
-ccd2cue            | []  []                                       []  |
+ccd2cue            | []  []                    []                 []  |
 ccide              | []  []                    [] []          []  []  |
 cflow              | []  []                    []             []  []  |
 clisp              | []  []     []                []              []  |
@@ -217,7 +217,7 @@ fusionforge        |     []                       []              []  |
 gas                |                              []          []  []  |
 gawk               | []  []                       []          []  []  |
 gcal               | []  []                       []              []  |
-gcc                |     []                       []                  |
+gcc                |     []                                           |
 gdbm               | []  []                    []             []  []  |
 gettext-examples   | []  []  []                [] []          []  []  |
 gettext-runtime    | []  []                    [] []          []  []  |
@@ -239,7 +239,7 @@ grep               | []  []                    [] [] []       []  []  |
 grub               | []  []                       []          []  []  |
 gsasl              | []  []                    []             []  []  |
 gss                | []  []                    []             []  []  |
-gst-plugins-bad    | []  []                                           |
+gst-plugins-bad    | []  []                                       []  |
 gst-plugins-base   | []  []  []                   []          []  []  |
 gst-plugins-good   | []  []  []                   []    []    []  []  |
 gst-plugins-ugly   | []  []  []                [] []    []    []  []  |
@@ -265,7 +265,6 @@ iso_639_5          |     ()                             ()        ()  |
 jwhois             |     []                    [] []          []  []  |
 kbd                | []  []  []                [] []              []  |
 klavaro            | []  []  []                [] []    []        []  |
-latrine            | []  ()                    []             []      |
 ld                 | []                           []          []  []  |
 leafpad            | []  []  []                [] []    []    []  []  |
 libc               | []  []                       []          []  []  |
@@ -296,6 +295,7 @@ nano               | []  []                    [] []    []    []  []  |
 opcodes            | []  []                       []          []  []  |
 parted             | []  []                                       []  |
 pies               |     []                                           |
+pnmixer            |     []                                       []  |
 popt               | []  []                    [] []          []  []  |
 procps-ng          |     []                                       []  |
 procps-ng-man      |     []                                       []  |
@@ -313,10 +313,10 @@ sarg               | []                                           []  |
 sed                | []  []  []                [] [] []       []  []  |
 sharutils          |     []                    []    []           []  |
 shishi             |     []                                   []  []  |
-skribilo           | []                                           []  |
+skribilo           | []                           []              []  |
 solfege            | []  []                    [] [] []    [] []  []  |
 solfege-manual     |     []                    [] [] []           []  |
-spotmachine        | []  []                    []             []      |
+spotmachine        | []  []                    []             []  []  |
 sudo               | []  []                    [] []          []  []  |
 sudoers            | []  []  []                []             []  []  |
 sysstat            | []  []                    [] []          []  []  |
@@ -333,7 +333,7 @@ ve                 |     []                    [] []          []  []  |
 vice               | ()  ()                                       ()  |
 vmm                |     []                                   []      |
 vorbis-tools       | []  []                    []                 []  |
-wastesedge         | []                                           ()  |
+wastesedge         | []                                               |
 wcd                |     []                    [] []          []      |
 wcd-man            |     []                                           |
 wdiff              | []  []                    [] [] []       []  []  |
@@ -344,7 +344,7 @@ xdg-user-dirs      | []  []  []                [] [] [] [] [] []  []  |
 xkeyboard-config   | []  []  []                [] []          []  []  |
                    +--------------------------------------------------+
                      da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
-                     120 130 32  1   6     0   94 95 22 13  4 103 136
+                     119 131 32  1   6     0   94 95 22 13  4 102 139
 @end group
 
 @group
@@ -354,7 +354,7 @@ a2ps               |                   []          []    [] []       |
 aegis              |                                     []          |
 anubis             |                   [] []       []    []          |
 aspell             | []                []          []    [] []       |
-bash               |                               []    [] []       |
+bash               |                      []       []    [] []       |
 bfd                |                               []       []       |
 binutils           |                               []    [] []       |
 bison              |                   []                            |
@@ -364,7 +364,7 @@ ccd2cue            |                      []                         |
 ccide              |                   [] []                         |
 cflow              | []                []          []                |
 clisp              |                                                 |
-coreutils          |                      []             [] []       |
+coreutils          |                      []                []       |
 cpio               | []                [] []       []    [] []       |
 cppi               |       []          [] []             [] []       |
 cpplib             |                               []       []       |
@@ -380,7 +380,7 @@ direvent           |                      []                         |
 doodle             | []                                  []          |
 dos2unix           |                      []                []       |
 dos2unix-man       |                                                 |
-e2fsprogs          |                               []                |
+e2fsprogs          |                      []       []                |
 enscript           | []                []          []                |
 exif               |       []          []          [] [] [] []       |
 fetchmail          |                               []    [] []       |
@@ -400,7 +400,7 @@ gjay               |       []                                        |
 glunarclock        | []    []          [] []       []    []          |
 gnubiff            |                      []       []    ()          |
 gnubik             |       []          []                []          |
-gnucash            |          () () ()    ()             () []       |
+gnucash            |          () () ()    ()             ()          |
 gnuchess           |                                                 |
 gnulib             | []    []             []             [] []       |
 gnunet             |                                                 |
@@ -413,7 +413,7 @@ grep               | []    []          [] []       []    [] []       |
 grub               |       []             []             []          |
 gsasl              | []                [] []       []    []          |
 gss                | []                [] []       []    []          |
-gst-plugins-bad    |                      []                         |
+gst-plugins-bad    |                   [] []       []                |
 gst-plugins-base   |       []          [] []       []                |
 gst-plugins-good   |       []          [] []       []    [] []       |
 gst-plugins-ugly   |       []          [] []       []    [] []       |
@@ -439,7 +439,6 @@ iso_639_5          |                                                 |
 jwhois             |       []             []       []    []          |
 kbd                |                      []       []    []          |
 klavaro            |       []          [] []             []       [] |
-latrine            |                      []                         |
 ld                 | []                            []    [] []       |
 leafpad            | []    []    []    [] []       []    [] ()       |
 libc               |       []          []          []    [] []       |
@@ -466,10 +465,11 @@ midi-instruments   |       []    []    [] [] []    [] [] [] []       |
 minicom            |                      []       []       []       |
 mkisofs            |                               []    []          |
 myserver           |                                     []          |
-nano               | []    []             []             [] []       |
+nano               | []    []          [] []             [] []       |
 opcodes            | []                            []    []          |
-parted             |       []                      []    [] []       |
+parted             |       []             []       []    [] []       |
 pies               |                                                 |
+pnmixer            |                   []                []          |
 popt               | []    [] []       [] []    [] [] [] [] []       |
 procps-ng          |                                                 |
 procps-ng-man      |                                                 |
@@ -493,10 +493,10 @@ solfege-manual     |                                                 |
 spotmachine        |                                                 |
 sudo               |       []          []                [] []       |
 sudoers            |                   []                [] []       |
-sysstat            |                      []       []       []       |
+sysstat            |                   [] []       []       []       |
 tar                | []                [] []       []    [] []       |
 texinfo            |                   []          []    []          |
-texinfo_document   |                      []             []          |
+texinfo_document   |                   [] []             []          |
 tigervnc           |                                                 |
 tin                |                                                 |
 tin-man            |                                                 |
@@ -507,18 +507,18 @@ ve                 |                                     []          |
 vice               |                      ()             ()          |
 vmm                |                                                 |
 vorbis-tools       |                   []          []                |
-wastesedge         |                                     ()          |
+wastesedge         |                                     []          |
 wcd                |                                                 |
 wcd-man            |                                                 |
 wdiff              |       []             []             []          |
-wget               |                      []             [] []       |
+wget               |                   [] []             [] []       |
 wyslij-po          |       []          []          []                |
 xboard             |                                                 |
 xdg-user-dirs      | [] [] [] [] [] [] [] []    [] [] [] [] []    [] |
-xkeyboard-config   |       []             []       []    [] []       |
+xkeyboard-config   |       []          [] []       []    [] []       |
                    +-------------------------------------------------+
                      ga gd gl gu he hi hr hu hy ia id is it ja ka kk
-                     35  2 47  4  8  2 53 69  2  6 80 11 86 58  0  3
+                     35  2 47  4  8  2 60 71  2  6 81 11 87 57  0  3
 @end group
 
 @group
@@ -556,7 +556,7 @@ dos2unix           |                                        []    []  |
 dos2unix-man       |                                              []  |
 e2fsprogs          |                                              []  |
 enscript           |                                              []  |
-exif               |                   []                         []  |
+exif               |    []             []                         []  |
 fetchmail          |                                              []  |
 findutils          |                                        []    []  |
 flex               |                                              []  |
@@ -568,7 +568,7 @@ gcal               |                                                  |
 gcc                |                                                  |
 gdbm               |                                                  |
 gettext-examples   |          []       []             [] [] []    []  |
-gettext-runtime    |    []                                        []  |
+gettext-runtime    |    []                                  []    []  |
 gettext-tools      |    []                                            |
 gjay               |                                                  |
 glunarclock        |                   []                         []  |
@@ -587,11 +587,11 @@ grep               |                                        []    []  |
 grub               |                []                      []    []  |
 gsasl              |                                              []  |
 gss                |                                                  |
-gst-plugins-bad    |                                        []    []  |
+gst-plugins-bad    |                   []                   []    []  |
 gst-plugins-base   |                   []                   []    []  |
 gst-plugins-good   |                [] []                   []    []  |
 gst-plugins-ugly   |                   []             [] [] []    []  |
-gstreamer          |                []                            []  |
+gstreamer          |                []                      []    []  |
 gtick              |                                              []  |
 gtkam              |                                        []    []  |
 gtkspell           |          []    [] []       []    []    []    []  |
@@ -613,7 +613,6 @@ iso_639_5          |                ()                                |
 jwhois             |                   []                         []  |
 kbd                |                                              []  |
 klavaro            |                                        []    []  |
-latrine            |                                                  |
 ld                 |                                                  |
 leafpad            |    []    []    [] []                         []  |
 libc               |    []                                        []  |
@@ -642,8 +641,9 @@ mkisofs            |                                              []  |
 myserver           |                                                  |
 nano               |                                  []    []    []  |
 opcodes            |                                              []  |
-parted             |                                              []  |
+parted             |    []                                        []  |
 pies               |                                                  |
+pnmixer            |                                              []  |
 popt               | [] []             []                   []    []  |
 procps-ng          |                                                  |
 procps-ng-man      |                                                  |
@@ -665,8 +665,8 @@ skribilo           |                                                  |
 solfege            |                                        []    []  |
 solfege-manual     |                                              []  |
 spotmachine        |                                              []  |
-sudo               |                                        []    []  |
-sudoers            |                                        []    []  |
+sudo               |    []                                  []    []  |
+sudoers            |    []                                  []    []  |
 sysstat            |                                        []    []  |
 tar                |          []                            []    []  |
 texinfo            |                                              []  |
@@ -692,528 +692,528 @@ xdg-user-dirs      | [] [] [] []    [] [] [] []    []       []    []  |
 xkeyboard-config   |    []          []                            []  |
                    +--------------------------------------------------+
                      kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
-                      5 11  4  6  0 13 22  3  3  3  4 11  2 40  1 124
+                      5 15  4  6  0 13 23  3  3  3  4 11  2 42  1 125
 @end group
 
 @group
-                     nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-                   +--------------------------------------------------+
-a2ps               |             []     []  []   [] []       []    [] |
-aegis              |                        []      []                |
-anubis             |             []                 []             [] |
-aspell             |             []         []   [] []    [] []    [] |
-bash               |             []                 []    [] []    [] |
-bfd                |                                []                |
-binutils           |                                []             [] |
-bison              |             []         []                     [] |
-bison-runtime      |             []     []  []   [] []       [] [] [] |
-buzztrax           |                                                  |
-ccd2cue            |                        []                        |
-ccide              |             []                 []             [] |
-cflow              |             []                                [] |
-clisp              |                                []                |
-coreutils          |             []                 []       []    [] |
-cpio               |             []                 []             [] |
-cppi               |             []         []                     [] |
-cpplib             |                        []      []             [] |
-cryptsetup         |             []                                [] |
-datamash           |                        []                     [] |
-denemo             |                                                  |
-dfarc              |             []         []                     [] |
-dialog             |             []         []   [] []    [] []    [] |
-dico               |             []                                   |
-diffutils          |             []                                [] |
-dink               |                                                  |
-direvent           |             []         []                        |
-doodle             |                                            [] [] |
-dos2unix           |             []         []      []             [] |
-dos2unix-man       |             []         []                        |
-e2fsprogs          |             []                                   |
-enscript           |             []         []   [] []       []    [] |
-exif               |             []         []   [] []    []       [] |
-fetchmail          |             []                 []          []    |
-findutils          |             []         []      []       []    [] |
-flex               |             []         []   [] []             [] |
-freedink           |             []         []      []       []    [] |
-fusionforge        |                                                  |
-gas                |                                                  |
-gawk               |             []                                   |
-gcal               |                                                  |
-gcc                |                                                  |
-gdbm               |             []         []                     [] |
-gettext-examples   |             []     []  []   [] []    [] []    [] |
-gettext-runtime    | []          []     []  []   [] []    [] []    [] |
-gettext-tools      |             []         []   [] []    [] []    [] |
-gjay               |                                               [] |
-glunarclock        |             []         []   []       [] []    [] |
-gnubiff            |                                               [] |
-gnubik             |             []         []               []    [] |
-gnucash            |             ()         ()   () ()             [] |
-gnuchess           |                        []                     [] |
-gnulib             |             []         []      []       []    [] |
-gnunet             |                                                  |
-gnunet-gtk         |                                                  |
-gold               |                                                  |
-gphoto2            |             []         []   [] []             [] |
-gprof              |                        []   [] []             [] |
-gramadoir          |                                      []       [] |
-grep               |             []         []      []    [] []    [] |
-grub               |             []         []      []       []    [] |
-gsasl              |             []                       []       [] |
-gss                |             []              []       []       [] |
-gst-plugins-bad    |             []         []      []             [] |
-gst-plugins-base   |             []         []      []    [] []    [] |
-gst-plugins-good   |             []         []   [] []    [] []    [] |
-gst-plugins-ugly   |             []         []   [] []    [] []    [] |
-gstreamer          |             []         []   [] []    [] []    [] |
-gtick              |             []         []      []    []       [] |
-gtkam              |          [] []         []      []    []       [] |
-gtkspell           |             []     []  []   [] []    [] [] [] [] |
-guix               |                                                  |
-guix-packages      |                                                  |
-gutenprint         |                                      [] []       |
-hello              |             []         []      []    [] []    [] |
-help2man           |             []         []      []             [] |
-help2man-texi      |             []                                   |
-hylafax            |                                                  |
-idutils            |             []                 []             [] |
-iso_15924          |             []     ()       [] []       []    [] |
-iso_3166           | [] []    [] []     ()  []   [] [] [] [] [] [] [] |
-iso_3166_2         |             []     ()                         [] |
-iso_4217           | []          []     ()       [] [] []    []    [] |
-iso_639            |    []    [] []     ()       [] [] [] [] []    [] |
-iso_639_3          |          []        ()                            |
-iso_639_5          |                    ()                         [] |
-jwhois             |             []         []   []                [] |
-kbd                |             []                 []                |
-klavaro            |          [] []         []      []       []       |
-latrine            |                        []                        |
-ld                 |                                                  |
-leafpad            | []    []    []     []  []      []    [] []    [] |
-libc               |             []                 []    []          |
-libexif            |             []         ()            []          |
-libextractor       |             []                                   |
-libgnutls          |             []                                   |
-libgphoto2         |             []                                   |
-libgphoto2_port    |             []         []      []    []       [] |
-libgsasl           |             []              []       []       [] |
-libiconv           |             []         []            [] []    [] |
-libidn             |             []         []                     [] |
-liferea            |             []     []  []   [] ()    []    []    |
-lilypond           |                                                  |
-lordsawar          |                                                  |
-lprng              |             []                                   |
-lynx               |                        []      []                |
-m4                 |             []         []   [] []             [] |
-mailfromd          |             []                                   |
-mailutils          |             []                                   |
-make               |             []         []      []                |
-man-db             |             []                 []             [] |
-man-db-manpages    |             []                 []             [] |
-midi-instruments   |             []     []  []   [] []    [] []    [] |
-minicom            |             []         []   [] []                |
-mkisofs            |             []                 []             [] |
-myserver           |                                         []    [] |
-nano               |             []         []   [] []       []    [] |
-opcodes            |                                                  |
-parted             |             []         []      []    [] []    [] |
-pies               |             []                                   |
-popt               |             []     []  []      []       []    [] |
-procps-ng          |             []                                   |
-procps-ng-man      |             []                                   |
-psmisc             |             []         []      []             [] |
-pspp               |             []                 []                |
-pushover           |                                                  |
-pwdutils           |             []                                   |
-pyspread           | []                     []                        |
-radius             |             []                 []                |
-recode             |             []     []  []   [] []    [] []    [] |
-recutils           |                                               [] |
-rpm                |             []                                   |
-rush               |             []         []                     [] |
-sarg               |                        []      []                |
-sed                |             []     []  []   [] []    [] []    [] |
-sharutils          |             []         []                     [] |
-shishi             |             []                                [] |
-skribilo           |                                                  |
-solfege            |             []         []      []                |
-solfege-manual     |             []         []                        |
-spotmachine        |                        []                     [] |
-sudo               |             []         []      []    [] []    [] |
-sudoers            |             []         []               []    [] |
-sysstat            |             []         []      []    []       [] |
-tar                |             []         []      []       []    [] |
-texinfo            |             []         []      []                |
-texinfo_document   |             []         []                        |
-tigervnc           |                        []                        |
-tin                |                                []                |
-tin-man            |                                                  |
-tracgoogleappsa... |             []         []      []             [] |
-trader             |                                []                |
-util-linux         |             []         []                        |
-ve                 |             []         []                     [] |
-vice               |                                                  |
-vmm                |                                                  |
-vorbis-tools       |             []                          []    [] |
-wastesedge         |                                                  |
-wcd                |                                                  |
-wcd-man            |                                                  |
-wdiff              |             []         []      []       []    [] |
-wget               |             []         []      []    []          |
-wyslij-po          | []          []         []                     [] |
-xboard             |             []                 []             [] |
-xdg-user-dirs      | [] []    [] []  [] []  []   [] []    [] [] [] [] |
-xkeyboard-config   |             []         []      []       []       |
-                   +--------------------------------------------------+
-                     nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-                      7  3  1  6 114  1 12  83   32 80  3 38 45  7 94
+                     nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
+                   +------------------------------------------------+
+a2ps               |          []     []  []   [] []       []    []  |
+aegis              |                     []      []                 |
+anubis             |          []                 []             []  |
+aspell             |          []         []   [] []    [] []    []  |
+bash               |          []         []      []    [] []    []  |
+bfd                |                             []             []  |
+binutils           |                             []             []  |
+bison              |          []         []                     []  |
+bison-runtime      |          []     []  []   [] []       [] [] []  |
+buzztrax           |                     []                         |
+ccd2cue            |                     []                     []  |
+ccide              |          []                 []             []  |
+cflow              |          []         []                     []  |
+clisp              |                             []                 |
+coreutils          |          []                 []       []    []  |
+cpio               |          []                 []             []  |
+cppi               |          []         []                     []  |
+cpplib             |                     []      []             []  |
+cryptsetup         |          []         []                     []  |
+datamash           |                     []                     []  |
+denemo             |                                                |
+dfarc              |          []         []                     []  |
+dialog             |          []         []   [] []    [] []    []  |
+dico               |          []                                    |
+diffutils          |          []         []                     []  |
+dink               |                                                |
+direvent           |          []         []                     []  |
+doodle             |                                         [] []  |
+dos2unix           |          []         []      []             []  |
+dos2unix-man       |          []         []                         |
+e2fsprogs          |          []                                    |
+enscript           |          []         []   [] []       []    []  |
+exif               |          []         []   [] []    []       []  |
+fetchmail          |          []                 []          []     |
+findutils          |          []         []      []    [] []    []  |
+flex               |          []         []   [] []             []  |
+freedink           |          []         []      []       []    []  |
+fusionforge        |                                                |
+gas                |                                                |
+gawk               |          []                                    |
+gcal               |                                                |
+gcc                |                                                |
+gdbm               |          []         []                     []  |
+gettext-examples   |          []     []  []   [] []    [] []    []  |
+gettext-runtime    | []       []     []  []   [] []    [] []    []  |
+gettext-tools      |          []         []   [] []    [] []    []  |
+gjay               |                                            []  |
+glunarclock        |          []         []   []       [] []    []  |
+gnubiff            |                                            []  |
+gnubik             |          []         []               []    []  |
+gnucash            |          ()     ()  ()   () ()             []  |
+gnuchess           |                     []                     []  |
+gnulib             |          []         []      []       []    []  |
+gnunet             |                                                |
+gnunet-gtk         |                                                |
+gold               |                                                |
+gphoto2            |          []         []   [] []             []  |
+gprof              |                     []   [] []             []  |
+gramadoir          |                                   []       []  |
+grep               |          []         []      []    [] []    []  |
+grub               |          []         []      []       []    []  |
+gsasl              |          []                       []       []  |
+gss                |          []              []       []       []  |
+gst-plugins-bad    |          []         []      []    []       []  |
+gst-plugins-base   |          []         []      []    [] []    []  |
+gst-plugins-good   |          []         []   [] []    [] []    []  |
+gst-plugins-ugly   |          []         []   [] []    [] []    []  |
+gstreamer          |          []         []   [] []    [] []    []  |
+gtick              |          []         []      []    []       []  |
+gtkam              |       [] []         []      []    []       []  |
+gtkspell           |          []     []  []   [] []    [] [] [] []  |
+guix               |                                                |
+guix-packages      |                                                |
+gutenprint         |                                   [] []        |
+hello              |          []         []      []    [] []    []  |
+help2man           |          []         []      []             []  |
+help2man-texi      |          []                                    |
+hylafax            |                                                |
+idutils            |          []                 []             []  |
+iso_15924          |          []     ()       [] []       []    []  |
+iso_3166           | [] [] [] []     ()  []   [] [] [] [] [] [] []  |
+iso_3166_2         |          []     ()                         []  |
+iso_4217           | []       []     ()       [] [] []    []    []  |
+iso_639            |    [] [] []     ()       [] [] [] [] []    []  |
+iso_639_3          |       []        ()                             |
+iso_639_5          |                 ()                         []  |
+jwhois             |          []         []   []                []  |
+kbd                |          []                 []                 |
+klavaro            |       [] []         []      []       []        |
+ld                 |                                                |
+leafpad            | []       []     []  []      []    [] []    []  |
+libc               |          []                 []    []           |
+libexif            |          []         ()            []           |
+libextractor       |          []                                    |
+libgnutls          |          []                                    |
+libgphoto2         |          []                                    |
+libgphoto2_port    |          []         []      []    []       []  |
+libgsasl           |          []              []       []       []  |
+libiconv           |          []         []            [] []    []  |
+libidn             |          []         []                     []  |
+liferea            |          []     []  []   [] ()    []    []     |
+lilypond           |                                                |
+lordsawar          |                                                |
+lprng              |          []                                    |
+lynx               |                     []      []                 |
+m4                 |          []         []   [] []             []  |
+mailfromd          |          []                                    |
+mailutils          |          []                                    |
+make               |          []         []      []                 |
+man-db             |          []                 []             []  |
+man-db-manpages    |          []                 []             []  |
+midi-instruments   |          []     []  []   [] []    [] []    []  |
+minicom            |          []         []   [] []                 |
+mkisofs            |          []                 []             []  |
+myserver           |                                      []    []  |
+nano               |          []         []   [] []       []    []  |
+opcodes            |                                                |
+parted             |          []         []      []    [] []    []  |
+pies               |          []                                    |
+pnmixer            |                             []                 |
+popt               |          []     []  []      []       []    []  |
+procps-ng          |          []                                    |
+procps-ng-man      |          []                                    |
+psmisc             |          []         []      []             []  |
+pspp               |          []                 []                 |
+pushover           |                                                |
+pwdutils           |          []                                    |
+pyspread           | []                  []                         |
+radius             |          []                 []                 |
+recode             |          []     []  []   [] []    [] []    []  |
+recutils           |                     []                     []  |
+rpm                |          []                                    |
+rush               |          []         []                     []  |
+sarg               |                     []      []                 |
+sed                |          []     []  []   [] []    [] []    []  |
+sharutils          |          []         []                     []  |
+shishi             |          []                                []  |
+skribilo           |                                            []  |
+solfege            |          []         []      []                 |
+solfege-manual     |          []         []                         |
+spotmachine        |                     []                     []  |
+sudo               |          []         []      []    [] []    []  |
+sudoers            |          []         []               []    []  |
+sysstat            |          []         []      []    []       []  |
+tar                |          []         []      []       []    []  |
+texinfo            |          []         []      []                 |
+texinfo_document   |          []         []                         |
+tigervnc           |                     []      []             []  |
+tin                |                             []                 |
+tin-man            |                                                |
+tracgoogleappsa... |          []         []      []             []  |
+trader             |                             []             []  |
+util-linux         |          []         []                         |
+ve                 |          []         []                     []  |
+vice               |                                                |
+vmm                |                                                |
+vorbis-tools       |          []                          []    []  |
+wastesedge         |                                                |
+wcd                |                                                |
+wcd-man            |                                                |
+wdiff              |          []         []      []       []    []  |
+wget               |          []         []      []    []       []  |
+wyslij-po          | []       []         []                     []  |
+xboard             |          []                 []             []  |
+xdg-user-dirs      | [] [] [] []  [] []  []   [] []    [] [] [] []  |
+xkeyboard-config   |          []         []      []       []        |
+                   +------------------------------------------------+
+                     nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
+                      7  3  6 114  1 12  88   32 82  3 40 45  7 101
 @end group
 
 @group
-                     sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
-                   +---------------------------------------------------+
-a2ps               | []             [] [] []     []                    |
-aegis              |                             []                    |
-anubis             | []                [] []     []                    |
-aspell             |                      []     []  []     []         |
-bash               | []                   []     []         []         |
-bfd                |                      []     []                    |
-binutils           | []                   []     []                    |
-bison              | []                   []     []         []         |
-bison-runtime      | []             [] [] []     []         []         |
-buzztrax           | []                          []         []         |
-ccd2cue            |                      []     []         []         |
-ccide              | []                   []     []         []         |
-cflow              | []                   []     []         []         |
-clisp              |                                                   |
-coreutils          | []                   []     []         []         |
-cpio               | []                [] []     []         []         |
-cppi               | []                   []     []         []         |
-cpplib             | []                [] []     []         []         |
-cryptsetup         |                      []     []         []         |
-datamash           | []                   []     []                    |
-denemo             |                                                   |
-dfarc              |                             []                    |
-dialog             | [] []          []           []  []     []         |
-dico               |                      []                           |
-diffutils          | []                [] []     []         []         |
-dink               |                                                   |
-direvent           |                      []     []                    |
-doodle             | []                          []                    |
-dos2unix           | []                   []     []         []         |
-dos2unix-man       | []                   []                []         |
-e2fsprogs          | []                   []     []         []         |
-enscript           | []                [] []     []                    |
-exif               | []                [] []     []         []         |
-fetchmail          | []                []        []         []         |
-findutils          | []                [] []     []         []         |
-flex               | []                []        []         []         |
-freedink           |                []           []                    |
-fusionforge        |                                                   |
-gas                |                      []                           |
-gawk               | []                          []                    |
-gcal               | []                []                              |
-gcc                | []                                     []         |
-gdbm               |                      []     []                    |
-gettext-examples   | []                [] []     []         []    []   |
-gettext-runtime    | []                [] []     []         []    []   |
-gettext-tools      | []                [] []     []         []         |
-gjay               |                []           []                    |
-glunarclock        | []                          []  []     []         |
-gnubiff            | []                          []                    |
-gnubik             | []                   []     []         []         |
-gnucash            |       () ()              () ()         []         |
-gnuchess           |                      []     []                    |
-gnulib             | []                   []     []         []         |
-gnunet             |                                                   |
-gnunet-gtk         |                                                   |
-gold               |                      []     []                    |
-gphoto2            | []                   []     []         []         |
-gprof              | []                [] []     []                    |
-gramadoir          | []                          []         []         |
-grep               | []             []    []     []         []         |
-grub               | []                [] []     []                    |
-gsasl              | []                   []     []         []         |
-gss                | []                          []         []         |
-gst-plugins-bad    | []                   []     []         []         |
-gst-plugins-base   | []                [] []     []         []         |
-gst-plugins-good   | []                [] []     []         []         |
-gst-plugins-ugly   | []                [] []     []         []         |
-gstreamer          | []                [] []     []         []         |
-gtick              |                      []     []         []         |
-gtkam              | []                   []     []         []         |
-gtkspell           | []             [] [] []     []  []     []    []   |
-guix               |                             []                    |
-guix-packages      |                                                   |
-gutenprint         |                   [] []     []         []         |
-hello              | []             [] [] []     []         []         |
-help2man           |                      []     []         []         |
-help2man-texi      |                      []                           |
-hylafax            |                             []                    |
-idutils            |                      []     []         []         |
-iso_15924          | []             () [] []     ()         []         |
-iso_3166           | []       []    () [] []     ()  []     []    []   |
-iso_3166_2         |                () [] []     ()         []         |
-iso_4217           | []             () [] []     ()         []    []   |
-iso_639            | []    [] []    () [] []     ()  []     []    []   |
-iso_639_3          |       []       () [] []     ()                    |
-iso_639_5          |                ()    []     ()                    |
-jwhois             | []                []        []         []         |
-kbd                |                      []     []         []         |
-klavaro            | []                   []  [] []     []  []         |
-latrine            |                             []         []         |
-ld                 | []                [] []     []         []         |
-leafpad            | []             [] [] []     []         []         |
-libc               | []                [] []     []         []         |
-libexif            |                             []         ()         |
-libextractor       |                      []     []                    |
-libgnutls          | []                   []     []         []         |
-libgphoto2         |                      []     []                    |
-libgphoto2_port    | []                   []     []         []         |
-libgsasl           | []                   []     []         []         |
-libiconv           | []                   []     []  []     []         |
-libidn             | ()                   []     []         []         |
-liferea            | []                [] []     []         []         |
-lilypond           |                             []                    |
-lordsawar          |                                                   |
-lprng              |                             []                    |
-lynx               | []                [] []     []                    |
-m4                 | []                          []         []         |
-mailfromd          |                      []     []                    |
-mailutils          |                             []                    |
-make               | []                   []     []         []         |
-man-db             |                             []         []         |
-man-db-manpages    |                                        []         |
-midi-instruments   | []             [] [] []     []         []         |
-minicom            | []                          []                    |
-mkisofs            |                      []     []         []         |
-myserver           |                             []                    |
-nano               | []                   []     []         []         |
-opcodes            |                      []     []         []         |
-parted             | []                [] []     []         []         |
-pies               |                      []     []                    |
-popt               | []    []       [] [] []     []         []         |
-procps-ng          |                      []     []                    |
-procps-ng-man      |                      []                           |
-psmisc             | []                   []     []         []         |
-pspp               |                   [] []                []         |
-pushover           | []                                                |
-pwdutils           | []                          []                    |
-pyspread           |                      []                           |
-radius             |                      []     []                    |
-recode             | []                []        []         []         |
-recutils           | []                   []     []                    |
-rpm                | []                   []     []         []         |
-rush               |                      []     []                    |
-sarg               |                                                   |
-sed                | []                [] []     []         []         |
-sharutils          |                      []     []         []         |
-shishi             |                             []         []         |
-skribilo           | []                                                |
-solfege            |                   []        []         []         |
-solfege-manual     |                   []                              |
-spotmachine        | []                   []     []                    |
-sudo               |                   [] []     []         []         |
-sudoers            |                      []     []         []         |
-sysstat            | []                [] []     []         []         |
-tar                | []                [] []     []         []         |
-texinfo            |                   [] []     []                    |
-texinfo_document   |                      []                           |
-tigervnc           | []                   []                           |
-tin                |                                        []         |
-tin-man            |                                                   |
-tracgoogleappsa... | []             []    []     []         []         |
-trader             | []                                                |
-util-linux         |                      []     []         []         |
-ve                 | []                   []     []         []         |
-vice               | ()                ()                              |
-vmm                |                                                   |
-vorbis-tools       | []                          []                    |
-wastesedge         |                                                   |
-wcd                |                      []     []         []         |
-wcd-man            |                      []                           |
-wdiff              | []                   []     []         []         |
-wget               |                      []     []         []         |
-wyslij-po          |                      []     []                    |
-xboard             |                      []                           |
-xdg-user-dirs      | []    [] []    [] [] []     []         []    []   |
-xkeyboard-config   | []                [] []     []                    |
-                   +---------------------------------------------------+
-                     sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
-                     91  1  4  3  0 13 50 113  1 126  7  1  95     7  
+                     sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
+                   +----------------------------------------------+
+a2ps               | []              [] [] []     []              |
+aegis              |                              []              |
+anubis             | []                 [] []     []              |
+aspell             | []                    []     []  []     []   |
+bash               | []                    []     []         []   |
+bfd                | []                    []     []              |
+binutils           | []                    []     []              |
+bison              | []                    []     []         []   |
+bison-runtime      | []              [] [] []     []         []   |
+buzztrax           | []                           []         []   |
+ccd2cue            |                       []     []         []   |
+ccide              | []                    []     []         []   |
+cflow              | []                    []     []         []   |
+clisp              |                                              |
+coreutils          | []                    []     []              |
+cpio               | []                 [] []     []         []   |
+cppi               | []                    []     []         []   |
+cpplib             | []                 [] []     []         []   |
+cryptsetup         |                       []     []         []   |
+datamash           | []                    []     []              |
+denemo             |                                         []   |
+dfarc              | []                           []              |
+dialog             | []  []          []           []  []     []   |
+dico               |                       []                     |
+diffutils          | []                 [] []     []         []   |
+dink               | []                                           |
+direvent           |                       []     []              |
+doodle             | []                           []              |
+dos2unix           | []                    []     []         []   |
+dos2unix-man       | []                    []                []   |
+e2fsprogs          | []                    []     []         []   |
+enscript           | []                 [] []     []              |
+exif               | []                 [] []     []         []   |
+fetchmail          | []                 []        []         []   |
+findutils          | []                 [] []     []         []   |
+flex               | []                 []        []         []   |
+freedink           | []              []           []              |
+fusionforge        |                                              |
+gas                |                       []                     |
+gawk               | []                           []         []   |
+gcal               | []                 []                   []   |
+gcc                | []                                           |
+gdbm               |                       []     []              |
+gettext-examples   | []                 [] []     []         []   |
+gettext-runtime    | []                 [] []     []         []   |
+gettext-tools      | []                 [] []     []         []   |
+gjay               |                 []           []         []   |
+glunarclock        | []                           []  []     []   |
+gnubiff            | []                           []              |
+gnubik             | []                    []     []         []   |
+gnucash            |        () ()              () ()         []   |
+gnuchess           |                       []     []         []   |
+gnulib             | []                    []     []         []   |
+gnunet             |                                              |
+gnunet-gtk         |                                              |
+gold               |                       []     []              |
+gphoto2            | []                    []     []         []   |
+gprof              | []                 [] []     []              |
+gramadoir          | []                           []         []   |
+grep               | []              []    []     []         []   |
+grub               | []                 [] []     []              |
+gsasl              | []                    []     []         []   |
+gss                | []                           []         []   |
+gst-plugins-bad    | []                 [] []     []         []   |
+gst-plugins-base   | []                 [] []     []         []   |
+gst-plugins-good   | []                 [] []     []         []   |
+gst-plugins-ugly   | []                 [] []     []         []   |
+gstreamer          | []                 [] []     []         []   |
+gtick              |                       []     []         []   |
+gtkam              | []                    []     []         []   |
+gtkspell           | []              [] [] []     []  []     []   |
+guix               |                                              |
+guix-packages      |                                              |
+gutenprint         |                    [] []     []         []   |
+hello              | []              [] [] []     []         []   |
+help2man           |                       []     []         []   |
+help2man-texi      |                       []                     |
+hylafax            |                              []              |
+idutils            |                       []     []         []   |
+iso_15924          | []              () [] []     ()         []   |
+iso_3166           | []        []    () [] []     ()  []     []   |
+iso_3166_2         |                 () [] []     ()         []   |
+iso_4217           | []              () [] []     ()         []   |
+iso_639            | []     [] []    () [] []     ()  []     []   |
+iso_639_3          |        []       () [] []     ()              |
+iso_639_5          |                 ()    []     ()              |
+jwhois             | []                 []        []         []   |
+kbd                | []                    []     []         []   |
+klavaro            | []                    []  [] []     []  []   |
+ld                 | []                 [] []     []         []   |
+leafpad            | []              [] [] []     []         []   |
+libc               | []                 [] []     []         []   |
+libexif            | []                           []         ()   |
+libextractor       |                       []     []              |
+libgnutls          | []                    []     []         []   |
+libgphoto2         | []                    []     []              |
+libgphoto2_port    | []                    []     []         []   |
+libgsasl           | []                    []     []         []   |
+libiconv           | []                    []     []  []     []   |
+libidn             | ()                    []     []         []   |
+liferea            | []                 [] []     []         []   |
+lilypond           |                              []              |
+lordsawar          |                                              |
+lprng              |                              []              |
+lynx               | []                 [] []     []              |
+m4                 | []                           []         []   |
+mailfromd          |                       []     []              |
+mailutils          |                              []              |
+make               | []                    []     []         []   |
+man-db             | []                           []         []   |
+man-db-manpages    | []                                      []   |
+midi-instruments   | []              [] [] []     []         []   |
+minicom            | []                           []              |
+mkisofs            |                       []     []         []   |
+myserver           |                              []              |
+nano               | []                    []     []         []   |
+opcodes            |                       []     []         []   |
+parted             | []                 [] []     []         []   |
+pies               |                       []     []              |
+pnmixer            |                       []     []         []   |
+popt               | []     []       [] [] []     []         []   |
+procps-ng          |                       []     []              |
+procps-ng-man      |                       []                     |
+psmisc             | []                    []     []         []   |
+pspp               |                    [] []                []   |
+pushover           | []                                           |
+pwdutils           | []                           []              |
+pyspread           |                       []                     |
+radius             |                       []     []              |
+recode             | []                 []        []         []   |
+recutils           | []                    []     []              |
+rpm                | []                    []     []         []   |
+rush               |                       []     []              |
+sarg               |                                              |
+sed                | []                 [] []     []         []   |
+sharutils          | []                    []     []         []   |
+shishi             |                              []         []   |
+skribilo           | []                    []                     |
+solfege            | []                 []        []         []   |
+solfege-manual     |                    []                        |
+spotmachine        | []                    []     []              |
+sudo               | []                 [] []     []         []   |
+sudoers            | []                    []     []         []   |
+sysstat            | []                 [] []     []         []   |
+tar                | []                 [] []     []         []   |
+texinfo            |                    [] []     []              |
+texinfo_document   |                       []                     |
+tigervnc           | []                    []                []   |
+tin                |                                         []   |
+tin-man            |                                              |
+tracgoogleappsa... | []              []    []     []         []   |
+trader             | []                                           |
+util-linux         | []                    []     []         []   |
+ve                 | []                    []     []         []   |
+vice               | ()                 ()                        |
+vmm                |                                              |
+vorbis-tools       | []                           []              |
+wastesedge         |                                              |
+wcd                |                       []     []         []   |
+wcd-man            |                       []                     |
+wdiff              | []                    []     []         []   |
+wget               |                       []     []         []   |
+wyslij-po          |                       []     []              |
+xboard             |                       []                []   |
+xdg-user-dirs      | []     [] []    [] [] []     []         []   |
+xkeyboard-config   | []                 [] []     []              |
+                   +----------------------------------------------+
+                     sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
+                     106  1  4  3  0 13 51 115  1 125  7  1  100 
 @end group
 
 @group
-                     zh_TW
-                   +-------+
-a2ps               |       | 30
-aegis              |       |  9
-anubis             |       | 19
-aspell             |       | 28
-bash               |  []   | 21
-bfd                |       |  9
-binutils           |       | 12
-bison              |  []   | 18
-bison-runtime      |  []   | 38
-buzztrax           |       |  8
-ccd2cue            |       |  8
-ccide              |       | 17
-cflow              |       | 15
-clisp              |       | 10
-coreutils          |       | 20
-cpio               |       | 20
-cppi               |       | 17
-cpplib             |  []   | 19
-cryptsetup         |       | 13
-datamash           |       | 11
-denemo             |       |  4
-dfarc              |       | 16
-dialog             |  []   | 42
-dico               |       |  6
-diffutils          |       | 21
-dink               |       |  9
-direvent           |       | 10
-doodle             |       | 12
-dos2unix           |  []   | 18
-dos2unix-man       |       |  9
-e2fsprogs          |       | 14
-enscript           |       | 21
-exif               |       | 26
-fetchmail          |       | 19
-findutils          |       | 28
-flex               |  []   | 19
-freedink           |       | 23
-fusionforge        |       |  3
-gas                |       |  5
-gawk               |       | 12
-gcal               |       |  7
-gcc                |       |  4
-gdbm               |       | 10
-gettext-examples   |  []   | 40
-gettext-runtime    |  []   | 34
-gettext-tools      |  []   | 24
-gjay               |       |  8
-glunarclock        |  []   | 27
-gnubiff            |       |  9
-gnubik             |       | 19
-gnucash            |  ()   |  7
-gnuchess           |       | 10
-gnulib             |       | 23
-gnunet             |       |  1
-gnunet-gtk         |       |  1
-gold               |       |  7
-gphoto2            |  []   | 19
-gprof              |       | 21
-gramadoir          |       | 14
-grep               |  []   | 31
-grub               |       | 21
-gsasl              |  []   | 19
-gss                |       | 17
-gst-plugins-bad    |       | 14
-gst-plugins-base   |       | 27
-gst-plugins-good   |       | 32
-gst-plugins-ugly   |       | 34
-gstreamer          |  []   | 31
-gtick              |       | 19
-gtkam              |       | 24
-gtkspell           |  []   | 48
-guix               |       |  3
-guix-packages      |       |  0
-gutenprint         |       | 15
-hello              |  []   | 30
-help2man           |       | 18
-help2man-texi      |       |  5
-hylafax            |       |  5
-idutils            |       | 14
-iso_15924          |  []   | 23
-iso_3166           |  []   | 58
-iso_3166_2         |       |  9
-iso_4217           |  []   | 28
-iso_639            |  []   | 46
-iso_639_3          |       | 10
-iso_639_5          |       |  2
-jwhois             |  []   | 20
-kbd                |       | 16
-klavaro            |       | 30
-latrine            |       |  7
-ld                 |  []   | 15
-leafpad            |  []   | 40
-libc               |  []   | 24
-libexif            |       |  9
-libextractor       |       |  5
-libgnutls          |       | 13
-libgphoto2         |       |  9
-libgphoto2_port    |  []   | 19
-libgsasl           |       | 18
-libiconv           |  []   | 29
-libidn             |       | 17
-liferea            |       | 29
-lilypond           |       | 11
-lordsawar          |       |  3
-lprng              |       |  3
-lynx               |       | 19
-m4                 |  []   | 22
-mailfromd          |       |  4
-mailutils          |       |  6
-make               |       | 19
-man-db             |       | 14
-man-db-manpages    |       |  9
-midi-instruments   |  []   | 43
-minicom            |  []   | 17
-mkisofs            |       | 13
-myserver           |       |  9
-nano               |  []   | 29
-opcodes            |       | 12
-parted             |  []   | 21
-pies               |       |  4
-popt               |  []   | 36
-procps-ng          |       |  5
-procps-ng-man      |       |  4
-psmisc             |  []   | 22
-pspp               |       | 13
-pushover           |       |  6
-pwdutils           |       |  8
-pyspread           |       |  6
-radius             |       |  9
-recode             |       | 31
-recutils           |       |  9
-rpm                |  []   | 13
-rush               |       | 10
-sarg               |       |  4
-sed                |  []   | 34
-sharutils          |       | 12
-shishi             |       |  7
-skribilo           |       |  4
-solfege            |       | 19
-solfege-manual     |       |  9
-spotmachine        |       | 10
-sudo               |       | 24
-sudoers            |       | 20
-sysstat            |       | 22
-tar                |  []   | 30
-texinfo            |       | 17
-texinfo_document   |       | 11
-tigervnc           |       | 11
-tin                |  []   |  7
-tin-man            |       |  1
-tracgoogleappsa... |  []   | 22
-trader             |       | 11
-util-linux         |       | 12
-ve                 |       | 14
-vice               |       |  1
-vmm                |       |  3
-vorbis-tools       |       | 13
-wastesedge         |       |  2
-wcd                |       |  8
-wcd-man            |       |  3
-wdiff              |  []   | 23
-wget               |       | 19
-wyslij-po          |       | 14
-xboard             |       |  9
-xdg-user-dirs      |  []   | 68
-xkeyboard-config   |  []   | 27
-                   +-------+
-  90 teams           zh_TW
- 166 domains          42    2748
+                     zh_HK zh_TW
+                   +-------------+
+a2ps               |             | 30
+aegis              |             |  9
+anubis             |             | 19
+aspell             |             | 29
+bash               |        []   | 23
+bfd                |             | 11
+binutils           |             | 12
+bison              |        []   | 18
+bison-runtime      |        []   | 38
+buzztrax           |             |  9
+ccd2cue            |             | 10
+ccide              |             | 17
+cflow              |             | 16
+clisp              |             | 10
+coreutils          |             | 18
+cpio               |             | 20
+cppi               |             | 17
+cpplib             |        []   | 19
+cryptsetup         |             | 14
+datamash           |             | 11
+denemo             |             |  5
+dfarc              |             | 17
+dialog             |        []   | 42
+dico               |             |  6
+diffutils          |             | 22
+dink               |             | 10
+direvent           |             | 11
+doodle             |             | 12
+dos2unix           |        []   | 18
+dos2unix-man       |             |  9
+e2fsprogs          |             | 15
+enscript           |             | 21
+exif               |             | 27
+fetchmail          |             | 19
+findutils          |             | 29
+flex               |        []   | 19
+freedink           |             | 24
+fusionforge        |             |  3
+gas                |             |  5
+gawk               |             | 13
+gcal               |             |  8
+gcc                |             |  2
+gdbm               |             | 10
+gettext-examples   |  []    []   | 40
+gettext-runtime    |  []    []   | 35
+gettext-tools      |        []   | 24
+gjay               |             |  9
+glunarclock        |        []   | 27
+gnubiff            |             |  9
+gnubik             |             | 19
+gnucash            |        ()   |  6
+gnuchess           |             | 11
+gnulib             |             | 23
+gnunet             |             |  1
+gnunet-gtk         |             |  1
+gold               |             |  7
+gphoto2            |        []   | 19
+gprof              |             | 21
+gramadoir          |             | 14
+grep               |        []   | 31
+grub               |             | 21
+gsasl              |        []   | 19
+gss                |             | 17
+gst-plugins-bad    |             | 21
+gst-plugins-base   |             | 27
+gst-plugins-good   |             | 32
+gst-plugins-ugly   |             | 34
+gstreamer          |        []   | 32
+gtick              |             | 19
+gtkam              |             | 24
+gtkspell           |  []    []   | 48
+guix               |             |  2
+guix-packages      |             |  0
+gutenprint         |             | 15
+hello              |        []   | 30
+help2man           |             | 18
+help2man-texi      |             |  5
+hylafax            |             |  5
+idutils            |             | 14
+iso_15924          |        []   | 23
+iso_3166           |  []    []   | 58
+iso_3166_2         |             |  9
+iso_4217           |  []    []   | 28
+iso_639            |  []    []   | 46
+iso_639_3          |             | 10
+iso_639_5          |             |  2
+jwhois             |        []   | 20
+kbd                |             | 17
+klavaro            |             | 30
+ld                 |        []   | 15
+leafpad            |        []   | 39
+libc               |        []   | 24
+libexif            |             | 10
+libextractor       |             |  5
+libgnutls          |             | 13
+libgphoto2         |             | 10
+libgphoto2_port    |        []   | 19
+libgsasl           |             | 18
+libiconv           |        []   | 29
+libidn             |             | 17
+liferea            |             | 29
+lilypond           |             | 11
+lordsawar          |             |  3
+lprng              |             |  3
+lynx               |             | 19
+m4                 |        []   | 22
+mailfromd          |             |  4
+mailutils          |             |  6
+make               |             | 19
+man-db             |             | 15
+man-db-manpages    |             | 10
+midi-instruments   |        []   | 43
+minicom            |        []   | 17
+mkisofs            |             | 13
+myserver           |             |  9
+nano               |        []   | 30
+opcodes            |             | 12
+parted             |        []   | 23
+pies               |             |  4
+pnmixer            |             |  9
+popt               |        []   | 36
+procps-ng          |             |  5
+procps-ng-man      |             |  4
+psmisc             |        []   | 22
+pspp               |             | 13
+pushover           |             |  6
+pwdutils           |             |  8
+pyspread           |             |  6
+radius             |             |  9
+recode             |             | 31
+recutils           |             | 10
+rpm                |        []   | 13
+rush               |             | 10
+sarg               |             |  4
+sed                |        []   | 35
+sharutils          |             | 13
+shishi             |             |  7
+skribilo           |             |  7
+solfege            |             | 21
+solfege-manual     |             |  9
+spotmachine        |             | 11
+sudo               |             | 26
+sudoers            |             | 22
+sysstat            |             | 23
+tar                |        []   | 30
+texinfo            |             | 17
+texinfo_document   |             | 13
+tigervnc           |             | 14
+tin                |        []   |  7
+tin-man            |             |  1
+tracgoogleappsa... |        []   | 22
+trader             |             | 12
+util-linux         |             | 13
+ve                 |             | 14
+vice               |             |  1
+vmm                |             |  3
+vorbis-tools       |             | 13
+wastesedge         |             |  3
+wcd                |             |  8
+wcd-man            |             |  3
+wdiff              |        []   | 23
+wget               |             | 21
+wyslij-po          |             | 14
+xboard             |             | 10
+xdg-user-dirs      |  []    []   | 68
+xkeyboard-config   |        []   | 28
+                   +-------------+
+  89 teams           zh_HK zh_TW
+ 166 domains           7    42    2809
 @end group
 @end example
diff --git a/gettext-runtime/gnulib-lib/Makefile.am b/gettext-runtime/gnulib-lib/Makefile.am
index d705e5c..2fec716 100644
--- a/gettext-runtime/gnulib-lib/Makefile.am
+++ b/gettext-runtime/gnulib-lib/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -322,6 +322,14 @@ V_GPERF_0 = @echo "  GPERF   " $@;
 
 ## end   gnulib module gperf
 
+## begin gnulib module hard-locale
+
+libgrt_a_SOURCES += hard-locale.c
+
+EXTRA_DIST += hard-locale.h
+
+## end   gnulib module hard-locale
+
 ## begin gnulib module havelib
 
 
diff --git a/gettext-runtime/gnulib-lib/Makefile.in b/gettext-runtime/gnulib-lib/Makefile.in
index aa1fcde..b69229f 100644
--- a/gettext-runtime/gnulib-lib/Makefile.in
+++ b/gettext-runtime/gnulib-lib/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -140,6 +140,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
@@ -247,15 +248,15 @@ am__DEPENDENCIES_1 =
 am__libgrt_a_SOURCES_DIST = allocator.c areadlink.c basename.h \
 	basename.c c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c \
 	c-strncasecmp.c careadlinkat.c closeout.h closeout.c \
-	fwriteerror.h fwriteerror.c gettext.h localcharset.h \
-	localcharset.c localename.c glthread/lock.h glthread/lock.c \
-	malloca.c mbchar.c mbiter.h mbiter.c mbslen.c mbsstr.c \
-	mbuiter.h mbuiter.c progname.h progname.c propername.h \
-	propername.c striconv.h striconv.c strnlen1.h strnlen1.c \
-	glthread/threadlib.c trim.c unistd.c unistr/u8-mbtoucr.c \
-	unistr/u8-uctomb.c unistr/u8-uctomb-aux.c uniwidth/width.c \
-	wctype-h.c xalloc.h xmalloc.c xstrdup.c xreadlink.c \
-	xstriconv.h xstriconv.c
+	fwriteerror.h fwriteerror.c gettext.h hard-locale.c \
+	localcharset.h localcharset.c localename.c glthread/lock.h \
+	glthread/lock.c malloca.c mbchar.c mbiter.h mbiter.c mbslen.c \
+	mbsstr.c mbuiter.h mbuiter.c progname.h progname.c \
+	propername.h propername.c striconv.h striconv.c strnlen1.h \
+	strnlen1.c glthread/threadlib.c trim.c unistd.c \
+	unistr/u8-mbtoucr.c unistr/u8-uctomb.c unistr/u8-uctomb-aux.c \
+	uniwidth/width.c wctype-h.c xalloc.h xmalloc.c xstrdup.c \
+	xreadlink.c xstriconv.h xstriconv.c
 am__dirstamp = $(am__leading_dot)dirstamp
 @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_1 = unistr/u8-mbtoucr.$(OBJEXT)
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_2 = unistr/u8-uctomb.$(OBJEXT) \
@@ -264,7 +265,7 @@ am__dirstamp = $(am__leading_dot)dirstamp
 am_libgrt_a_OBJECTS = allocator.$(OBJEXT) areadlink.$(OBJEXT) \
 	basename.$(OBJEXT) c-ctype.$(OBJEXT) c-strcasecmp.$(OBJEXT) \
 	c-strncasecmp.$(OBJEXT) careadlinkat.$(OBJEXT) \
-	closeout.$(OBJEXT) fwriteerror.$(OBJEXT) \
+	closeout.$(OBJEXT) fwriteerror.$(OBJEXT) hard-locale.$(OBJEXT) \
 	localcharset.$(OBJEXT) localename.$(OBJEXT) \
 	glthread/lock.$(OBJEXT) malloca.$(OBJEXT) mbchar.$(OBJEXT) \
 	mbiter.$(OBJEXT) mbslen.$(OBJEXT) mbsstr.$(OBJEXT) \
@@ -1286,7 +1287,7 @@ EXTRA_DIST = alloca.in.h allocator.h areadlink.h atexit.c \
 	canonicalize-lgpl.c careadlinkat.h \
 	$(top_srcdir)/../build-aux/csharpcomp.sh.in dosname.h \
 	errno.in.h error.c error.h getopt.c getopt.in.h getopt1.c \
-	getopt_int.h gettimeofday.c \
+	getopt_int.h gettimeofday.c hard-locale.h \
 	$(top_srcdir)/../build-aux/config.rpath iconv.in.h \
 	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
 	iconv_open-osf.h iconv_open-solaris.h iconv.c iconv_close.c \
@@ -1376,11 +1377,11 @@ AM_CFLAGS =
 libgrt_a_SOURCES = allocator.c areadlink.c basename.h basename.c \
 	c-ctype.h c-ctype.c c-strcase.h c-strcasecmp.c c-strncasecmp.c \
 	careadlinkat.c closeout.h closeout.c fwriteerror.h \
-	fwriteerror.c gettext.h localcharset.h localcharset.c \
-	localename.c glthread/lock.h glthread/lock.c malloca.c \
-	mbchar.c mbiter.h mbiter.c mbslen.c mbsstr.c mbuiter.h \
-	mbuiter.c progname.h progname.c propername.h propername.c \
-	striconv.h striconv.c strnlen1.h strnlen1.c \
+	fwriteerror.c gettext.h hard-locale.c localcharset.h \
+	localcharset.c localename.c glthread/lock.h glthread/lock.c \
+	malloca.c mbchar.c mbiter.h mbiter.c mbslen.c mbsstr.c \
+	mbuiter.h mbuiter.c progname.h progname.c propername.h \
+	propername.c striconv.h striconv.c strnlen1.h strnlen1.c \
 	glthread/threadlib.c trim.c unistd.c $(am__append_2) \
 	$(am__append_3) $(am__append_4) wctype-h.c xalloc.h xmalloc.c \
 	xstrdup.c xreadlink.c xstriconv.h xstriconv.c
diff --git a/gettext-runtime/gnulib-lib/alloca.in.h b/gettext-runtime/gnulib-lib/alloca.in.h
index b334262..8603e79 100644
--- a/gettext-runtime/gnulib-lib/alloca.in.h
+++ b/gettext-runtime/gnulib-lib/alloca.in.h
@@ -1,5 +1,5 @@
 /* Memory allocation on the stack.
-   Copyright (C) 1995, 1999, 2001-2007, 2015 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2007, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/allocator.h b/gettext-runtime/gnulib-lib/allocator.h
index c7c851f..1f1eab6 100644
--- a/gettext-runtime/gnulib-lib/allocator.h
+++ b/gettext-runtime/gnulib-lib/allocator.h
@@ -1,6 +1,6 @@
 /* Memory allocators such as malloc+free.
 
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-runtime/gnulib-lib/areadlink.c b/gettext-runtime/gnulib-lib/areadlink.c
index 248cc6b..fee84a3 100644
--- a/gettext-runtime/gnulib-lib/areadlink.c
+++ b/gettext-runtime/gnulib-lib/areadlink.c
@@ -1,7 +1,7 @@
 /* areadlink.c -- readlink wrapper to return the link name in malloc'd storage
    Unlike xreadlink and xreadlink_with_size, don't ever call exit.
 
-   Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/areadlink.h b/gettext-runtime/gnulib-lib/areadlink.h
index d9e0fa1..829c959 100644
--- a/gettext-runtime/gnulib-lib/areadlink.h
+++ b/gettext-runtime/gnulib-lib/areadlink.h
@@ -1,6 +1,6 @@
 /* Read symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/basename.c b/gettext-runtime/gnulib-lib/basename.c
index 56421aa..3518ade 100644
--- a/gettext-runtime/gnulib-lib/basename.c
+++ b/gettext-runtime/gnulib-lib/basename.c
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015 Free Software
+   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-runtime/gnulib-lib/basename.h b/gettext-runtime/gnulib-lib/basename.h
index 489cc67..2d7f0ad 100644
--- a/gettext-runtime/gnulib-lib/basename.h
+++ b/gettext-runtime/gnulib-lib/basename.h
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001-2003, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/c-ctype.h b/gettext-runtime/gnulib-lib/c-ctype.h
index 1512530..717ae78 100644
--- a/gettext-runtime/gnulib-lib/c-ctype.h
+++ b/gettext-runtime/gnulib-lib/c-ctype.h
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2016 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
diff --git a/gettext-runtime/gnulib-lib/c-strcase.h b/gettext-runtime/gnulib-lib/c-strcase.h
index f25bcca..7e570f5 100644
--- a/gettext-runtime/gnulib-lib/c-strcase.h
+++ b/gettext-runtime/gnulib-lib/c-strcase.h
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2015 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/c-strcasecmp.c b/gettext-runtime/gnulib-lib/c-strcasecmp.c
index 6deb6d1..bd113b7 100644
--- a/gettext-runtime/gnulib-lib/c-strcasecmp.c
+++ b/gettext-runtime/gnulib-lib/c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/c-strncasecmp.c b/gettext-runtime/gnulib-lib/c-strncasecmp.c
index b98e368..c316929 100644
--- a/gettext-runtime/gnulib-lib/c-strncasecmp.c
+++ b/gettext-runtime/gnulib-lib/c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/canonicalize-lgpl.c b/gettext-runtime/gnulib-lib/canonicalize-lgpl.c
index 1c9f2ee..1d0bf65 100644
--- a/gettext-runtime/gnulib-lib/canonicalize-lgpl.c
+++ b/gettext-runtime/gnulib-lib/canonicalize-lgpl.c
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2015 Free Software Foundation, Inc.
+   Copyright (C) 1996-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/careadlinkat.c b/gettext-runtime/gnulib-lib/careadlinkat.c
index f2f5da2..4180de9 100644
--- a/gettext-runtime/gnulib-lib/careadlinkat.c
+++ b/gettext-runtime/gnulib-lib/careadlinkat.c
@@ -1,6 +1,6 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/careadlinkat.h b/gettext-runtime/gnulib-lib/careadlinkat.h
index 4eb9fcc..84ede3e 100644
--- a/gettext-runtime/gnulib-lib/careadlinkat.h
+++ b/gettext-runtime/gnulib-lib/careadlinkat.h
@@ -1,6 +1,6 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-runtime/gnulib-lib/closeout.c b/gettext-runtime/gnulib-lib/closeout.c
index a790176..8bba65b 100644
--- a/gettext-runtime/gnulib-lib/closeout.c
+++ b/gettext-runtime/gnulib-lib/closeout.c
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output and standard error
-   Copyright (C) 1998-2007, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2007, 2012, 2015-2016 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
diff --git a/gettext-runtime/gnulib-lib/closeout.h b/gettext-runtime/gnulib-lib/closeout.h
index 896e22f..284d1e7 100644
--- a/gettext-runtime/gnulib-lib/closeout.h
+++ b/gettext-runtime/gnulib-lib/closeout.h
@@ -1,5 +1,5 @@
 /* Close standard output and standard error.
-   Copyright (C) 1998-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2003, 2006, 2015-2016 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
diff --git a/gettext-runtime/gnulib-lib/config.charset b/gettext-runtime/gnulib-lib/config.charset
index f06d7e9..947d916 100644
--- a/gettext-runtime/gnulib-lib/config.charset
+++ b/gettext-runtime/gnulib-lib/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2016 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
diff --git a/gettext-runtime/gnulib-lib/dosname.h b/gettext-runtime/gnulib-lib/dosname.h
index 893baf6..83a953f 100644
--- a/gettext-runtime/gnulib-lib/dosname.h
+++ b/gettext-runtime/gnulib-lib/dosname.h
@@ -1,6 +1,6 @@
 /* File names on MS-DOS/Windows systems.
 
-   Copyright (C) 2000-2001, 2004-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2004-2006, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/errno.in.h b/gettext-runtime/gnulib-lib/errno.in.h
index affbb97..b8397ee 100644
--- a/gettext-runtime/gnulib-lib/errno.in.h
+++ b/gettext-runtime/gnulib-lib/errno.in.h
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-runtime/gnulib-lib/error.c b/gettext-runtime/gnulib-lib/error.c
index 0ac7695..56ac889 100644
--- a/gettext-runtime/gnulib-lib/error.c
+++ b/gettext-runtime/gnulib-lib/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/error.h b/gettext-runtime/gnulib-lib/error.h
index c5b3736..a9c19cb 100644
--- a/gettext-runtime/gnulib-lib/error.h
+++ b/gettext-runtime/gnulib-lib/error.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2015 Free Software Foundation,
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2016 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-runtime/gnulib-lib/fwriteerror.c b/gettext-runtime/gnulib-lib/fwriteerror.c
index 8e7c3ea..3581975 100644
--- a/gettext-runtime/gnulib-lib/fwriteerror.c
+++ b/gettext-runtime/gnulib-lib/fwriteerror.c
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/fwriteerror.h b/gettext-runtime/gnulib-lib/fwriteerror.h
index 438f453..af548da 100644
--- a/gettext-runtime/gnulib-lib/fwriteerror.h
+++ b/gettext-runtime/gnulib-lib/fwriteerror.h
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/getopt.c b/gettext-runtime/gnulib-lib/getopt.c
index 212cbf7..8ccb901 100644
--- a/gettext-runtime/gnulib-lib/getopt.c
+++ b/gettext-runtime/gnulib-lib/getopt.c
@@ -2,7 +2,7 @@
    NOTE: getopt is part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to drepper@gnu.org
    before changing it!
-   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2015 Free Software
+   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-runtime/gnulib-lib/getopt.in.h b/gettext-runtime/gnulib-lib/getopt.in.h
index f869970..4f6d2e7 100644
--- a/gettext-runtime/gnulib-lib/getopt.in.h
+++ b/gettext-runtime/gnulib-lib/getopt.in.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2015 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-runtime/gnulib-lib/getopt1.c b/gettext-runtime/gnulib-lib/getopt1.c
index 2b1feb6..63db74f 100644
--- a/gettext-runtime/gnulib-lib/getopt1.c
+++ b/gettext-runtime/gnulib-lib/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2015 Free Software
+   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-runtime/gnulib-lib/getopt_int.h b/gettext-runtime/gnulib-lib/getopt_int.h
index e893a6e..be4c22e 100644
--- a/gettext-runtime/gnulib-lib/getopt_int.h
+++ b/gettext-runtime/gnulib-lib/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2015 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-runtime/gnulib-lib/gettext.h b/gettext-runtime/gnulib-lib/gettext.h
index f37d586..841b072 100644
--- a/gettext-runtime/gnulib-lib/gettext.h
+++ b/gettext-runtime/gnulib-lib/gettext.h
@@ -1,6 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 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
@@ -225,15 +225,17 @@ dcpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcgettext (domain, msg_ctxt_id, category);
+      found_translation = (translation != msg_ctxt_id);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (translation != msg_ctxt_id)
+      if (found_translation)
         return translation;
     }
   return msgid;
@@ -271,15 +273,17 @@ dcnpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+      found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (!(translation == msg_ctxt_id || translation == msgid_plural))
+      if (found_translation)
         return translation;
     }
   return (n == 1 ? msgid : msgid_plural);
diff --git a/gettext-runtime/gnulib-lib/gettimeofday.c b/gettext-runtime/gnulib-lib/gettimeofday.c
index e0e2e69..224ca6a 100644
--- a/gettext-runtime/gnulib-lib/gettimeofday.c
+++ b/gettext-runtime/gnulib-lib/gettimeofday.c
@@ -1,6 +1,6 @@
 /* Provide gettimeofday for systems that don't have it or for which it's broken.
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/glthread/lock.c b/gettext-runtime/gnulib-lib/glthread/lock.c
index b64132a..935043b 100644
--- a/gettext-runtime/gnulib-lib/glthread/lock.c
+++ b/gettext-runtime/gnulib-lib/glthread/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-runtime/gnulib-lib/glthread/lock.h b/gettext-runtime/gnulib-lib/glthread/lock.h
index cf3d0d9..e64506b 100644
--- a/gettext-runtime/gnulib-lib/glthread/lock.h
+++ b/gettext-runtime/gnulib-lib/glthread/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-runtime/gnulib-lib/glthread/threadlib.c b/gettext-runtime/gnulib-lib/glthread/threadlib.c
index f01d351..be63713 100644
--- a/gettext-runtime/gnulib-lib/glthread/threadlib.c
+++ b/gettext-runtime/gnulib-lib/glthread/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-runtime/gnulib-lib/hard-locale.c b/gettext-runtime/gnulib-lib/hard-locale.c
new file mode 100644
index 0000000..c7d9da5
--- /dev/null
+++ b/gettext-runtime/gnulib-lib/hard-locale.c
@@ -0,0 +1,72 @@
+/* hard-locale.c -- Determine whether a locale is hard.
+
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2016 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "hard-locale.h"
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __GLIBC__
+# define GLIBC_VERSION __GLIBC__
+#elif defined __UCLIBC__
+# define GLIBC_VERSION 2
+#else
+# define GLIBC_VERSION 0
+#endif
+
+/* Return true if the current CATEGORY locale is hard, i.e. if you
+   can't get away with assuming traditional C or POSIX behavior.  */
+bool
+hard_locale (int category)
+{
+  bool hard = true;
+  char const *p = setlocale (category, NULL);
+
+  if (p)
+    {
+      if (2 <= GLIBC_VERSION)
+        {
+          if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+            hard = false;
+        }
+      else
+        {
+          char *locale = strdup (p);
+          if (locale)
+            {
+              /* Temporarily set the locale to the "C" and "POSIX" locales
+                 to find their names, so that we can determine whether one
+                 or the other is the caller's locale.  */
+              if (((p = setlocale (category, "C"))
+                   && strcmp (p, locale) == 0)
+                  || ((p = setlocale (category, "POSIX"))
+                      && strcmp (p, locale) == 0))
+                hard = false;
+
+              /* Restore the caller's locale.  */
+              setlocale (category, locale);
+              free (locale);
+            }
+        }
+    }
+
+  return hard;
+}
diff --git a/gettext-runtime/gnulib-lib/hard-locale.h b/gettext-runtime/gnulib-lib/hard-locale.h
new file mode 100644
index 0000000..7644afa
--- /dev/null
+++ b/gettext-runtime/gnulib-lib/hard-locale.h
@@ -0,0 +1,25 @@
+/* Determine whether a locale is hard.
+
+   Copyright (C) 1999, 2003-2004, 2009-2016 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef HARD_LOCALE_H_
+# define HARD_LOCALE_H_ 1
+
+# include <stdbool.h>
+
+bool hard_locale (int);
+
+#endif /* HARD_LOCALE_H_ */
diff --git a/gettext-runtime/gnulib-lib/iconv.c b/gettext-runtime/gnulib-lib/iconv.c
index 28c13c5..9ce9c01 100644
--- a/gettext-runtime/gnulib-lib/iconv.c
+++ b/gettext-runtime/gnulib-lib/iconv.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/iconv.in.h b/gettext-runtime/gnulib-lib/iconv.in.h
index 94ab806..cb1da14 100644
--- a/gettext-runtime/gnulib-lib/iconv.in.h
+++ b/gettext-runtime/gnulib-lib/iconv.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-runtime/gnulib-lib/iconv_close.c b/gettext-runtime/gnulib-lib/iconv_close.c
index 59e0aca..d1cd793 100644
--- a/gettext-runtime/gnulib-lib/iconv_close.c
+++ b/gettext-runtime/gnulib-lib/iconv_close.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/iconv_open.c b/gettext-runtime/gnulib-lib/iconv_open.c
index 09d042d..d5c5a52 100644
--- a/gettext-runtime/gnulib-lib/iconv_open.c
+++ b/gettext-runtime/gnulib-lib/iconv_open.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/intprops.h b/gettext-runtime/gnulib-lib/intprops.h
index ecafaf7..3152139 100644
--- a/gettext-runtime/gnulib-lib/intprops.h
+++ b/gettext-runtime/gnulib-lib/intprops.h
@@ -1,10 +1,10 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2016 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
-   the Free Software Foundation; either version 3 of the License, or
+   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 the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -21,6 +21,7 @@
 #define _GL_INTPROPS_H
 
 #include <limits.h>
+#include <verify.h>
 
 /* Return a value with the common real type of E and V and the value of V.  */
 #define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
@@ -36,17 +37,6 @@
    an integer.  */
 #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
 
-/* True if negative values of the signed integer type T use two's
-   complement, ones' complement, or signed magnitude representation,
-   respectively.  Much GNU code assumes two's complement, but some
-   people like to be portable to all possible C hosts.  */
-#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
-/* True if the signed integer expression E uses two's complement.  */
-#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1)
-
 /* True if the real type T is signed.  */
 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
@@ -55,18 +45,10 @@
 #define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
 
 
-/* Minimum and maximum values for integer types and expressions.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
+/* Minimum and maximum values for integer types and expressions.  */
 
 /* The maximum and minimum values for the integer type T.  */
-#define TYPE_MINIMUM(t)                                                 \
-  ((t) (! TYPE_SIGNED (t)                                               \
-        ? (t) 0                                                         \
-        : TYPE_SIGNED_MAGNITUDE (t)                                     \
-        ? ~ (t) 0                                                       \
-        : ~ TYPE_MAXIMUM (t)))
+#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
 #define TYPE_MAXIMUM(t)                                                 \
   ((t) (! TYPE_SIGNED (t)                                               \
         ? (t) -1                                                        \
@@ -76,7 +58,7 @@
    after integer promotion.  E should not have side effects.  */
 #define _GL_INT_MINIMUM(e)                                              \
   (EXPR_SIGNED (e)                                                      \
-   ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e)         \
+   ? ~ _GL_SIGNED_INT_MAXIMUM (e)                                       \
    : _GL_INT_CONVERT (e, 0))
 #define _GL_INT_MAXIMUM(e)                                              \
   (EXPR_SIGNED (e)                                                      \
@@ -85,8 +67,25 @@
 #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
   (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
 
+/* This include file assumes that signed types are two's complement without
+   padding bits; the above macros have undefined behavior otherwise.
+   If this is a problem for you, please let us know how to fix it for your host.
+   As a sanity check, test the assumption for some signed types that
+   <limits.h> bounds.  */
+verify (TYPE_MINIMUM (signed char) == SCHAR_MIN);
+verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX);
+verify (TYPE_MINIMUM (short int) == SHRT_MIN);
+verify (TYPE_MAXIMUM (short int) == SHRT_MAX);
+verify (TYPE_MINIMUM (int) == INT_MIN);
+verify (TYPE_MAXIMUM (int) == INT_MAX);
+verify (TYPE_MINIMUM (long int) == LONG_MIN);
+verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+#ifdef LLONG_MAX
+verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+#endif
 
-/* Return 1 if the __typeof__ keyword works.  This could be done by
+/* Does the __typeof__ keyword work?  This could be done by
    'configure', but for now it's easier to do it by hand.  */
 #if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
      || (0x5110 <= __SUNPRO_C && !__STDC__))
diff --git a/gettext-runtime/gnulib-lib/iswblank.c b/gettext-runtime/gnulib-lib/iswblank.c
index 94be115..8d47ee5 100644
--- a/gettext-runtime/gnulib-lib/iswblank.c
+++ b/gettext-runtime/gnulib-lib/iswblank.c
@@ -1,5 +1,5 @@
 /* Test wide character for being blank.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-runtime/gnulib-lib/langinfo.in.h b/gettext-runtime/gnulib-lib/langinfo.in.h
index 04fd535..e11617c 100644
--- a/gettext-runtime/gnulib-lib/langinfo.in.h
+++ b/gettext-runtime/gnulib-lib/langinfo.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <langinfo.h>.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/localcharset.c b/gettext-runtime/gnulib-lib/localcharset.c
index 1f02aa5..b2a0369 100644
--- a/gettext-runtime/gnulib-lib/localcharset.c
+++ b/gettext-runtime/gnulib-lib/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2016 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
diff --git a/gettext-runtime/gnulib-lib/localcharset.h b/gettext-runtime/gnulib-lib/localcharset.h
index c5e6d46..915182e 100644
--- a/gettext-runtime/gnulib-lib/localcharset.h
+++ b/gettext-runtime/gnulib-lib/localcharset.h
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU CHARSET Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/locale.in.h b/gettext-runtime/gnulib-lib/locale.in.h
index 05e974d..4083507 100644
--- a/gettext-runtime/gnulib-lib/locale.in.h
+++ b/gettext-runtime/gnulib-lib/locale.in.h
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-runtime/gnulib-lib/localename.c b/gettext-runtime/gnulib-lib/localename.c
index c256ad5..e67bd01 100644
--- a/gettext-runtime/gnulib-lib/localename.c
+++ b/gettext-runtime/gnulib-lib/localename.c
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 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
diff --git a/gettext-runtime/gnulib-lib/localename.h b/gettext-runtime/gnulib-lib/localename.h
index 13c126d..17f0d85 100644
--- a/gettext-runtime/gnulib-lib/localename.h
+++ b/gettext-runtime/gnulib-lib/localename.h
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/lstat.c b/gettext-runtime/gnulib-lib/lstat.c
index 31dee13..03b0634 100644
--- a/gettext-runtime/gnulib-lib/lstat.c
+++ b/gettext-runtime/gnulib-lib/lstat.c
@@ -1,6 +1,6 @@
 /* Work around a bug of lstat on some systems
 
-   Copyright (C) 1997-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997-2006, 2008-2016 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
diff --git a/gettext-runtime/gnulib-lib/malloca.c b/gettext-runtime/gnulib-lib/malloca.c
index 198a96c..a613277 100644
--- a/gettext-runtime/gnulib-lib/malloca.c
+++ b/gettext-runtime/gnulib-lib/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/malloca.h b/gettext-runtime/gnulib-lib/malloca.h
index 7a4190c..fa27a9e 100644
--- a/gettext-runtime/gnulib-lib/malloca.h
+++ b/gettext-runtime/gnulib-lib/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/mbchar.c b/gettext-runtime/gnulib-lib/mbchar.c
index ae9b7eb..27796c3 100644
--- a/gettext-runtime/gnulib-lib/mbchar.c
+++ b/gettext-runtime/gnulib-lib/mbchar.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/mbchar.h b/gettext-runtime/gnulib-lib/mbchar.h
index fcdefaf..2017d86 100644
--- a/gettext-runtime/gnulib-lib/mbchar.h
+++ b/gettext-runtime/gnulib-lib/mbchar.h
@@ -1,5 +1,5 @@
 /* Multibyte character data type.
-   Copyright (C) 2001, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005-2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/mbiter.h b/gettext-runtime/gnulib-lib/mbiter.h
index ccc1d19..d72b0a7 100644
--- a/gettext-runtime/gnulib-lib/mbiter.h
+++ b/gettext-runtime/gnulib-lib/mbiter.h
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/mbrtowc.c b/gettext-runtime/gnulib-lib/mbrtowc.c
index e49d55b..cdd874b 100644
--- a/gettext-runtime/gnulib-lib/mbrtowc.c
+++ b/gettext-runtime/gnulib-lib/mbrtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,11 @@
 /* Specification.  */
 #include <wchar.h>
 
+#if C_LOCALE_MAYBE_EILSEQ
+# include "hard-locale.h"
+# include <locale.h>
+#endif
+
 #if GNULIB_defined_mbstate_t
 /* Implement mbrtowc() on top of mbtowc().  */
 
@@ -328,6 +333,9 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 size_t
 rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
+  size_t ret;
+  wchar_t wc;
+
 # if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
   if (s == NULL)
     {
@@ -342,6 +350,9 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
     return (size_t) -2;
 # endif
 
+  if (! pwc)
+    pwc = &wc;
+
 # if MBRTOWC_RETVAL_BUG
   {
     static mbstate_t internal_state;
@@ -357,8 +368,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
         size_t count = 0;
         for (; n > 0; s++, n--)
           {
-            wchar_t wc;
-            size_t ret = mbrtowc (&wc, s, 1, ps);
+            ret = mbrtowc (&wc, s, 1, ps);
 
             if (ret == (size_t)(-1))
               return (size_t)(-1);
@@ -366,8 +376,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
             if (ret != (size_t)(-2))
               {
                 /* The multibyte character has been completed.  */
-                if (pwc != NULL)
-                  *pwc = wc;
+                *pwc = wc;
                 return (wc == 0 ? 0 : count);
               }
           }
@@ -376,32 +385,23 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
   }
 # endif
 
-# if MBRTOWC_NUL_RETVAL_BUG
-  {
-    wchar_t wc;
-    size_t ret = mbrtowc (&wc, s, n, ps);
+  ret = mbrtowc (pwc, s, n, ps);
 
-    if (ret != (size_t)(-1) && ret != (size_t)(-2))
-      {
-        if (pwc != NULL)
-          *pwc = wc;
-        if (wc == 0)
-          ret = 0;
-      }
-    return ret;
-  }
-# else
-  {
-#   if MBRTOWC_NULL_ARG1_BUG
-    wchar_t dummy;
-
-    if (pwc == NULL)
-      pwc = &dummy;
-#   endif
+# if MBRTOWC_NUL_RETVAL_BUG
+  if (ret < (size_t) -2 && !*pwc)
+    return 0;
+# endif
 
-    return mbrtowc (pwc, s, n, ps);
-  }
+# if C_LOCALE_MAYBE_EILSEQ
+  if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
+    {
+      unsigned char uc = *s;
+      *pwc = uc;
+      return 1;
+    }
 # endif
+
+  return ret;
 }
 
 #endif
diff --git a/gettext-runtime/gnulib-lib/mbsinit.c b/gettext-runtime/gnulib-lib/mbsinit.c
index 4effdd8..372b523 100644
--- a/gettext-runtime/gnulib-lib/mbsinit.c
+++ b/gettext-runtime/gnulib-lib/mbsinit.c
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/mbslen.c b/gettext-runtime/gnulib-lib/mbslen.c
index 011f821..ed13a42 100644
--- a/gettext-runtime/gnulib-lib/mbslen.c
+++ b/gettext-runtime/gnulib-lib/mbslen.c
@@ -1,5 +1,5 @@
 /* Counting the multibyte characters in a string.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/mbsstr.c b/gettext-runtime/gnulib-lib/mbsstr.c
index 6d5239e..bc738d4 100644
--- a/gettext-runtime/gnulib-lib/mbsstr.c
+++ b/gettext-runtime/gnulib-lib/mbsstr.c
@@ -1,5 +1,5 @@
 /* Searching in a string.  -*- coding: utf-8 -*-
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/mbuiter.h b/gettext-runtime/gnulib-lib/mbuiter.h
index acdec29..aad4fea 100644
--- a/gettext-runtime/gnulib-lib/mbuiter.h
+++ b/gettext-runtime/gnulib-lib/mbuiter.h
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/memchr.c b/gettext-runtime/gnulib-lib/memchr.c
index f74cc9a..b565542 100644
--- a/gettext-runtime/gnulib-lib/memchr.c
+++ b/gettext-runtime/gnulib-lib/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/gettext-runtime/gnulib-lib/msvc-inval.c b/gettext-runtime/gnulib-lib/msvc-inval.c
index a1f1dc0..baaf39e 100644
--- a/gettext-runtime/gnulib-lib/msvc-inval.c
+++ b/gettext-runtime/gnulib-lib/msvc-inval.c
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-runtime/gnulib-lib/msvc-inval.h b/gettext-runtime/gnulib-lib/msvc-inval.h
index 8b07269..027c949 100644
--- a/gettext-runtime/gnulib-lib/msvc-inval.h
+++ b/gettext-runtime/gnulib-lib/msvc-inval.h
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-runtime/gnulib-lib/msvc-nothrow.c b/gettext-runtime/gnulib-lib/msvc-nothrow.c
index 90cf801..ba75bbf 100644
--- a/gettext-runtime/gnulib-lib/msvc-nothrow.c
+++ b/gettext-runtime/gnulib-lib/msvc-nothrow.c
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-runtime/gnulib-lib/msvc-nothrow.h b/gettext-runtime/gnulib-lib/msvc-nothrow.h
index 67b151e..3493b84 100644
--- a/gettext-runtime/gnulib-lib/msvc-nothrow.h
+++ b/gettext-runtime/gnulib-lib/msvc-nothrow.h
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-runtime/gnulib-lib/pathmax.h b/gettext-runtime/gnulib-lib/pathmax.h
index 2f3b64f..aee22f8 100644
--- a/gettext-runtime/gnulib-lib/pathmax.h
+++ b/gettext-runtime/gnulib-lib/pathmax.h
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2015 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/progname.c b/gettext-runtime/gnulib-lib/progname.c
index fe93bca..debb760 100644
--- a/gettext-runtime/gnulib-lib/progname.c
+++ b/gettext-runtime/gnulib-lib/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/progname.h b/gettext-runtime/gnulib-lib/progname.h
index 15ca3a2..526828f 100644
--- a/gettext-runtime/gnulib-lib/progname.h
+++ b/gettext-runtime/gnulib-lib/progname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/progreloc.c b/gettext-runtime/gnulib-lib/progreloc.c
index 1d2b4b3..6f06897 100644
--- a/gettext-runtime/gnulib-lib/progreloc.c
+++ b/gettext-runtime/gnulib-lib/progreloc.c
@@ -1,5 +1,5 @@
 /* Provide relocatable programs.
-   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/propername.c b/gettext-runtime/gnulib-lib/propername.c
index 293e7e3..90ad284 100644
--- a/gettext-runtime/gnulib-lib/propername.c
+++ b/gettext-runtime/gnulib-lib/propername.c
@@ -1,5 +1,5 @@
 /* Localization of proper names.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/propername.h b/gettext-runtime/gnulib-lib/propername.h
index 68e617e..83fac08 100644
--- a/gettext-runtime/gnulib-lib/propername.h
+++ b/gettext-runtime/gnulib-lib/propername.h
@@ -1,5 +1,5 @@
 /* Localization of proper names.  -*- coding: utf-8 -*-
-   Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/raise.c b/gettext-runtime/gnulib-lib/raise.c
index d6ba2a1..bf24c3e 100644
--- a/gettext-runtime/gnulib-lib/raise.c
+++ b/gettext-runtime/gnulib-lib/raise.c
@@ -1,6 +1,6 @@
 /* Provide a non-threads replacement for the POSIX raise function.
 
-   Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2006, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/readlink.c b/gettext-runtime/gnulib-lib/readlink.c
index 965c3e2..e6c3925 100644
--- a/gettext-runtime/gnulib-lib/readlink.c
+++ b/gettext-runtime/gnulib-lib/readlink.c
@@ -1,5 +1,5 @@
 /* Stub for readlink().
-   Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/ref-add.sin b/gettext-runtime/gnulib-lib/ref-add.sin
index 6cbe5b5..42d3ab0 100644
--- a/gettext-runtime/gnulib-lib/ref-add.sin
+++ b/gettext-runtime/gnulib-lib/ref-add.sin
@@ -1,6 +1,6 @@
 # Add this package to a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/ref-del.sin b/gettext-runtime/gnulib-lib/ref-del.sin
index f50cf0a..c77b33b 100644
--- a/gettext-runtime/gnulib-lib/ref-del.sin
+++ b/gettext-runtime/gnulib-lib/ref-del.sin
@@ -1,6 +1,6 @@
 # Remove this package from a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/relocatable.c b/gettext-runtime/gnulib-lib/relocatable.c
index bed882d..7a59595 100644
--- a/gettext-runtime/gnulib-lib/relocatable.c
+++ b/gettext-runtime/gnulib-lib/relocatable.c
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/relocatable.h b/gettext-runtime/gnulib-lib/relocatable.h
index c8911b2..4081f22 100644
--- a/gettext-runtime/gnulib-lib/relocatable.h
+++ b/gettext-runtime/gnulib-lib/relocatable.h
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003, 2005, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/relocwrapper.c b/gettext-runtime/gnulib-lib/relocwrapper.c
index f85cf9a..5eefa2b 100644
--- a/gettext-runtime/gnulib-lib/relocwrapper.c
+++ b/gettext-runtime/gnulib-lib/relocwrapper.c
@@ -1,5 +1,5 @@
 /* Relocating wrapper program.
-   Copyright (C) 2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/setenv.c b/gettext-runtime/gnulib-lib/setenv.c
index 6b16fd5..85c32cb 100644
--- a/gettext-runtime/gnulib-lib/setenv.c
+++ b/gettext-runtime/gnulib-lib/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/setlocale.c b/gettext-runtime/gnulib-lib/setlocale.c
index ed68ce2..7d366ed 100644
--- a/gettext-runtime/gnulib-lib/setlocale.c
+++ b/gettext-runtime/gnulib-lib/setlocale.c
@@ -1,5 +1,5 @@
 /* Set the current locale.  -*- coding: utf-8 -*-
-   Copyright (C) 2009, 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011-2016 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
@@ -381,6 +381,7 @@ static const struct table_entry language_table[] =
     { "sq", "Albanian" },
     { "sr", "Serbian (Latin)" },
     { "sr@cyrillic", "SRB" }, /* Serbian (Cyrillic) */
+    { "sv", "Swedish" },
     { "sw", "Swahili" },
     { "syr", "Syriac" },
     { "ta", "Tamil" },
diff --git a/gettext-runtime/gnulib-lib/signal.in.h b/gettext-runtime/gnulib-lib/signal.in.h
index 265b72a..ab0a049 100644
--- a/gettext-runtime/gnulib-lib/signal.in.h
+++ b/gettext-runtime/gnulib-lib/signal.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <signal.h>.
 
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-runtime/gnulib-lib/sigprocmask.c b/gettext-runtime/gnulib-lib/sigprocmask.c
index e29b012..fcbf032 100644
--- a/gettext-runtime/gnulib-lib/sigprocmask.c
+++ b/gettext-runtime/gnulib-lib/sigprocmask.c
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/stat.c b/gettext-runtime/gnulib-lib/stat.c
index 2209826..62e9e0b 100644
--- a/gettext-runtime/gnulib-lib/stat.c
+++ b/gettext-runtime/gnulib-lib/stat.c
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/stdbool.in.h b/gettext-runtime/gnulib-lib/stdbool.in.h
index 64a1761..7ecf203 100644
--- a/gettext-runtime/gnulib-lib/stdbool.in.h
+++ b/gettext-runtime/gnulib-lib/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/stddef.in.h b/gettext-runtime/gnulib-lib/stddef.in.h
index 698307b..f4c4a10 100644
--- a/gettext-runtime/gnulib-lib/stddef.in.h
+++ b/gettext-runtime/gnulib-lib/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
@@ -81,8 +81,10 @@
 # define wchar_t int
 #endif
 
-/* Some platforms lack max_align_t.  */
-#if !@HAVE_MAX_ALIGN_T@
+/* Some platforms lack max_align_t.  The check for _GCC_MAX_ALIGN_T is
+   a hack in case the configure-time test was done with g++ even though
+   we are currently compiling with gcc.  */
+#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)
 /* On the x86, the maximum storage alignment of double, long, etc. is 4,
    but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
    and the C11 standard allows this.  Work around this problem by
diff --git a/gettext-runtime/gnulib-lib/stdint.in.h b/gettext-runtime/gnulib-lib/stdint.in.h
index 378de2e..cf65ec6 100644
--- a/gettext-runtime/gnulib-lib/stdint.in.h
+++ b/gettext-runtime/gnulib-lib/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2016 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -118,15 +118,10 @@
    picky compilers.  */
 
 #define _STDINT_MIN(signed, bits, zero) \
-  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
+  ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero))
 
 #define _STDINT_MAX(signed, bits, zero) \
-  ((signed) \
-   ? ~ _STDINT_MIN (signed, bits, zero) \
-   : /* The expression for the unsigned case.  The subtraction of (signed) \
-        is a nop in the unsigned case and avoids "signed integer overflow" \
-        warnings in the signed case.  */ \
-     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+  (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
 
 #if !GNULIB_defined_stdint_types
 
@@ -288,12 +283,17 @@ typedef gl_uint_fast32_t gl_uint_fast16_t;
 
 /* 7.18.1.4. Integer types capable of holding object pointers */
 
+/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
+   definitions of intptr_t and uintptr_t (which use int and unsigned)
+   to avoid clashes with declarations of system functions like sbrk.  */
+#ifndef _INTPTR_T_DECLARED
 #undef intptr_t
 #undef uintptr_t
 typedef long int gl_intptr_t;
 typedef unsigned long int gl_uintptr_t;
 #define intptr_t gl_intptr_t
 #define uintptr_t gl_uintptr_t
+#endif
 
 /* 7.18.1.5. Greatest-width integer types */
 
diff --git a/gettext-runtime/gnulib-lib/stdio-write.c b/gettext-runtime/gnulib-lib/stdio-write.c
index b913101..072e55b 100644
--- a/gettext-runtime/gnulib-lib/stdio-write.c
+++ b/gettext-runtime/gnulib-lib/stdio-write.c
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream write function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/stdio.in.h b/gettext-runtime/gnulib-lib/stdio.in.h
index ec43874..9b31365 100644
--- a/gettext-runtime/gnulib-lib/stdio.in.h
+++ b/gettext-runtime/gnulib-lib/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2016 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
diff --git a/gettext-runtime/gnulib-lib/stdlib.in.h b/gettext-runtime/gnulib-lib/stdlib.in.h
index 428a119..70dc88d 100644
--- a/gettext-runtime/gnulib-lib/stdlib.in.h
+++ b/gettext-runtime/gnulib-lib/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2016 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
diff --git a/gettext-runtime/gnulib-lib/str-kmp.h b/gettext-runtime/gnulib-lib/str-kmp.h
index 66fcead..fcb2813 100644
--- a/gettext-runtime/gnulib-lib/str-kmp.h
+++ b/gettext-runtime/gnulib-lib/str-kmp.h
@@ -1,6 +1,6 @@
 /* Substring search in a NUL terminated string of UNIT elements,
    using the Knuth-Morris-Pratt algorithm.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/streq.h b/gettext-runtime/gnulib-lib/streq.h
index 6107fc6..234f075 100644
--- a/gettext-runtime/gnulib-lib/streq.h
+++ b/gettext-runtime/gnulib-lib/streq.h
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/strerror-override.c b/gettext-runtime/gnulib-lib/strerror-override.c
index 2bb4d74..9bc9b18 100644
--- a/gettext-runtime/gnulib-lib/strerror-override.c
+++ b/gettext-runtime/gnulib-lib/strerror-override.c
@@ -1,6 +1,6 @@
 /* strerror-override.c --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-runtime/gnulib-lib/strerror-override.h b/gettext-runtime/gnulib-lib/strerror-override.h
index 7af36df..5264fd5 100644
--- a/gettext-runtime/gnulib-lib/strerror-override.h
+++ b/gettext-runtime/gnulib-lib/strerror-override.h
@@ -1,6 +1,6 @@
 /* strerror-override.h --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-runtime/gnulib-lib/strerror.c b/gettext-runtime/gnulib-lib/strerror.c
index adba738..45c7633 100644
--- a/gettext-runtime/gnulib-lib/strerror.c
+++ b/gettext-runtime/gnulib-lib/strerror.c
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-runtime/gnulib-lib/striconv.c b/gettext-runtime/gnulib-lib/striconv.c
index 6f7dad8..0d9ccdc 100644
--- a/gettext-runtime/gnulib-lib/striconv.c
+++ b/gettext-runtime/gnulib-lib/striconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2010-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/striconv.h b/gettext-runtime/gnulib-lib/striconv.h
index 33cc212..e5217d7 100644
--- a/gettext-runtime/gnulib-lib/striconv.h
+++ b/gettext-runtime/gnulib-lib/striconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/string.in.h b/gettext-runtime/gnulib-lib/string.in.h
index 2abd6bc..7fb00c1 100644
--- a/gettext-runtime/gnulib-lib/string.in.h
+++ b/gettext-runtime/gnulib-lib/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2016 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
diff --git a/gettext-runtime/gnulib-lib/strnlen.c b/gettext-runtime/gnulib-lib/strnlen.c
index 79e250c..1bd7936 100644
--- a/gettext-runtime/gnulib-lib/strnlen.c
+++ b/gettext-runtime/gnulib-lib/strnlen.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/strnlen1.c b/gettext-runtime/gnulib-lib/strnlen1.c
index 48272a8..f5e0ffc 100644
--- a/gettext-runtime/gnulib-lib/strnlen1.c
+++ b/gettext-runtime/gnulib-lib/strnlen1.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/strnlen1.h b/gettext-runtime/gnulib-lib/strnlen1.h
index 794e436..d3cd7c1 100644
--- a/gettext-runtime/gnulib-lib/strnlen1.h
+++ b/gettext-runtime/gnulib-lib/strnlen1.h
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/strtol.c b/gettext-runtime/gnulib-lib/strtol.c
index 1bc1439..6ef8a96 100644
--- a/gettext-runtime/gnulib-lib/strtol.c
+++ b/gettext-runtime/gnulib-lib/strtol.c
@@ -1,6 +1,6 @@
 /* Convert string representation of a number into an integer value.
 
-   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2015 Free Software
+   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
@@ -121,30 +121,19 @@
 /* The extra casts in the following macros work around compiler bugs,
    e.g., in Cray C 5.0.3.0.  */
 
-/* True if negative values of the signed integer type T use two's
-   complement, ones' complement, or signed magnitude representation,
-   respectively.  Much GNU code assumes two's complement, but some
-   people like to be portable to all possible C hosts.  */
-# define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-# define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-# define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
 /* True if the arithmetic type T is signed.  */
 # define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
-/* The maximum and minimum values for the integer type T.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
-# define TYPE_MINIMUM(t) \
-   ((t) (! TYPE_SIGNED (t) \
-         ? (t) 0 \
-         : TYPE_SIGNED_MAGNITUDE (t) \
-         ? ~ (t) 0 \
-         : ~ TYPE_MAXIMUM (t)))
-# define TYPE_MAXIMUM(t) \
-   ((t) (! TYPE_SIGNED (t) \
-         ? (t) -1 \
+/* Minimum and maximum values for integer types.
+   These macros have undefined behavior for signed types that either
+   have padding bits or do not use two's complement.  If this is a
+   problem for you, please let us know how to fix it for your host.  */
+
+/* The maximum and minimum values for the integer type T.  */
+# define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+# define TYPE_MAXIMUM(t)                                                 \
+   ((t) (! TYPE_SIGNED (t)                                               \
+         ? (t) -1                                                        \
          : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
 
 # ifndef ULLONG_MAX
diff --git a/gettext-runtime/gnulib-lib/strtoul.c b/gettext-runtime/gnulib-lib/strtoul.c
index 2051777..6a5d4dd 100644
--- a/gettext-runtime/gnulib-lib/strtoul.c
+++ b/gettext-runtime/gnulib-lib/strtoul.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/sys_stat.in.h b/gettext-runtime/gnulib-lib/sys_stat.in.h
index 9f5e853..72d9537 100644
--- a/gettext-runtime/gnulib-lib/sys_stat.in.h
+++ b/gettext-runtime/gnulib-lib/sys_stat.in.h
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-runtime/gnulib-lib/sys_time.in.h b/gettext-runtime/gnulib-lib/sys_time.in.h
index c556c5d..1623a1d 100644
--- a/gettext-runtime/gnulib-lib/sys_time.in.h
+++ b/gettext-runtime/gnulib-lib/sys_time.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/time.h.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-runtime/gnulib-lib/sys_types.in.h b/gettext-runtime/gnulib-lib/sys_types.in.h
index 814bc17..8ab0545 100644
--- a/gettext-runtime/gnulib-lib/sys_types.in.h
+++ b/gettext-runtime/gnulib-lib/sys_types.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/types.h.
 
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-runtime/gnulib-lib/time.in.h b/gettext-runtime/gnulib-lib/time.in.h
index a90552c..865c114 100644
--- a/gettext-runtime/gnulib-lib/time.in.h
+++ b/gettext-runtime/gnulib-lib/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-runtime/gnulib-lib/trim.c b/gettext-runtime/gnulib-lib/trim.c
index 369b20f..6f681a7 100644
--- a/gettext-runtime/gnulib-lib/trim.c
+++ b/gettext-runtime/gnulib-lib/trim.c
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-runtime/gnulib-lib/trim.h b/gettext-runtime/gnulib-lib/trim.h
index 8a38a9f..01c22f2 100644
--- a/gettext-runtime/gnulib-lib/trim.h
+++ b/gettext-runtime/gnulib-lib/trim.h
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/unistd.in.h b/gettext-runtime/gnulib-lib/unistd.in.h
index 93f1ed9..a9ac097 100644
--- a/gettext-runtime/gnulib-lib/unistd.in.h
+++ b/gettext-runtime/gnulib-lib/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 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
diff --git a/gettext-runtime/gnulib-lib/unistr.in.h b/gettext-runtime/gnulib-lib/unistr.in.h
index be158be..70aa9cb 100644
--- a/gettext-runtime/gnulib-lib/unistr.in.h
+++ b/gettext-runtime/gnulib-lib/unistr.in.h
@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2016 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
diff --git a/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c b/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c
index 9cc1500..48f9ca3 100644
--- a/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c
+++ b/gettext-runtime/gnulib-lib/unistr/u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string, returning an error code.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c b/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c
index 65445be..d5ff1d6 100644
--- a/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c
+++ b/gettext-runtime/gnulib-lib/unistr/u8-uctomb-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c b/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c
index a8250f4..419a6b4 100644
--- a/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c
+++ b/gettext-runtime/gnulib-lib/unistr/u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/unitypes.in.h b/gettext-runtime/gnulib-lib/unitypes.in.h
index d3c47ae..c6ca0ba 100644
--- a/gettext-runtime/gnulib-lib/unitypes.in.h
+++ b/gettext-runtime/gnulib-lib/unitypes.in.h
@@ -1,5 +1,5 @@
 /* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/uniwidth.in.h b/gettext-runtime/gnulib-lib/uniwidth.in.h
index 7694beb..0ab6d25 100644
--- a/gettext-runtime/gnulib-lib/uniwidth.in.h
+++ b/gettext-runtime/gnulib-lib/uniwidth.in.h
@@ -1,5 +1,5 @@
 /* Display width functions.
-   Copyright (C) 2001-2002, 2005, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/uniwidth/cjk.h b/gettext-runtime/gnulib-lib/uniwidth/cjk.h
index cdd9a55..0eac6fe 100644
--- a/gettext-runtime/gnulib-lib/uniwidth/cjk.h
+++ b/gettext-runtime/gnulib-lib/uniwidth/cjk.h
@@ -1,5 +1,5 @@
 /* Test for CJK encoding.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/uniwidth/width.c b/gettext-runtime/gnulib-lib/uniwidth/width.c
index c7e03b2..bd3b3fc 100644
--- a/gettext-runtime/gnulib-lib/uniwidth/width.c
+++ b/gettext-runtime/gnulib-lib/uniwidth/width.c
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-runtime/gnulib-lib/unlocked-io.h b/gettext-runtime/gnulib-lib/unlocked-io.h
index 06ffac6..c0ece50 100644
--- a/gettext-runtime/gnulib-lib/unlocked-io.h
+++ b/gettext-runtime/gnulib-lib/unlocked-io.h
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/verify.h b/gettext-runtime/gnulib-lib/verify.h
index 60eba49..2f43837 100644
--- a/gettext-runtime/gnulib-lib/verify.h
+++ b/gettext-runtime/gnulib-lib/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/wchar.in.h b/gettext-runtime/gnulib-lib/wchar.in.h
index 684299f..755600f 100644
--- a/gettext-runtime/gnulib-lib/wchar.in.h
+++ b/gettext-runtime/gnulib-lib/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
@@ -31,7 +31,7 @@
 @PRAGMA_COLUMNS@
 
 #if (((defined __need_mbstate_t || defined __need_wint_t)               \
-      && !defined __MINGW32__)                                          \
+      && !defined __MINGW32__ && !defined __KLIBC__)                    \
      || (defined __hpux                                                 \
          && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
              || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H))               \
@@ -445,6 +445,11 @@ _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
 #  if !@HAVE_DECL_WCWIDTH@
 /* wcwidth exists but is not declared.  */
 _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+#  elif defined __KLIBC__
+/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a
+   static inline function.  The implementation of wcwidth in wcwidth.c
+   causes a "conflicting types" error. */
+#   undef wcwidth
 #  endif
 _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
 # endif
diff --git a/gettext-runtime/gnulib-lib/wctype.in.h b/gettext-runtime/gnulib-lib/wctype.in.h
index 9050b7e..3431854 100644
--- a/gettext-runtime/gnulib-lib/wctype.in.h
+++ b/gettext-runtime/gnulib-lib/wctype.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-runtime/gnulib-lib/wcwidth.c b/gettext-runtime/gnulib-lib/wcwidth.c
index d2b7118..b94fad0 100644
--- a/gettext-runtime/gnulib-lib/wcwidth.c
+++ b/gettext-runtime/gnulib-lib/wcwidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a character.
-   Copyright (C) 2006-2007, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010-2016 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
diff --git a/gettext-runtime/gnulib-lib/xalloc.h b/gettext-runtime/gnulib-lib/xalloc.h
index b261994..f4a329e 100644
--- a/gettext-runtime/gnulib-lib/xalloc.h
+++ b/gettext-runtime/gnulib-lib/xalloc.h
@@ -1,5 +1,5 @@
 /* malloc with out of memory checking.
-   Copyright (C) 2001-2004, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/xmalloc.c b/gettext-runtime/gnulib-lib/xmalloc.c
index 43dcb94..9d435a5 100644
--- a/gettext-runtime/gnulib-lib/xmalloc.c
+++ b/gettext-runtime/gnulib-lib/xmalloc.c
@@ -1,6 +1,6 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015-2016 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
diff --git a/gettext-runtime/gnulib-lib/xreadlink.c b/gettext-runtime/gnulib-lib/xreadlink.c
index 5082d0b..901f946 100644
--- a/gettext-runtime/gnulib-lib/xreadlink.c
+++ b/gettext-runtime/gnulib-lib/xreadlink.c
@@ -1,6 +1,6 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2016 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
diff --git a/gettext-runtime/gnulib-lib/xreadlink.h b/gettext-runtime/gnulib-lib/xreadlink.h
index a970eb9..555c27d 100644
--- a/gettext-runtime/gnulib-lib/xreadlink.h
+++ b/gettext-runtime/gnulib-lib/xreadlink.h
@@ -1,6 +1,6 @@
 /* Reading symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/xstrdup.c b/gettext-runtime/gnulib-lib/xstrdup.c
index 7aa09dc..c7fbe14 100644
--- a/gettext-runtime/gnulib-lib/xstrdup.c
+++ b/gettext-runtime/gnulib-lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015 Free Software
+   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/xstriconv.c b/gettext-runtime/gnulib-lib/xstriconv.c
index d5e1951..2dbee18 100644
--- a/gettext-runtime/gnulib-lib/xstriconv.c
+++ b/gettext-runtime/gnulib-lib/xstriconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-lib/xstriconv.h b/gettext-runtime/gnulib-lib/xstriconv.h
index 6319989..61e7c75 100644
--- a/gettext-runtime/gnulib-lib/xstriconv.h
+++ b/gettext-runtime/gnulib-lib/xstriconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/gnulib-m4/00gnulib.m4 b/gettext-runtime/gnulib-m4/00gnulib.m4
index c7103ed..bb37e32 100644
--- a/gettext-runtime/gnulib-m4/00gnulib.m4
+++ b/gettext-runtime/gnulib-m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/absolute-header.m4 b/gettext-runtime/gnulib-m4/absolute-header.m4
index bc19dfc..7ffc38d 100644
--- a/gettext-runtime/gnulib-m4/absolute-header.m4
+++ b/gettext-runtime/gnulib-m4/absolute-header.m4
@@ -1,5 +1,5 @@
 # absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/alloca.m4 b/gettext-runtime/gnulib-m4/alloca.m4
index c7165e5..64f9a79 100644
--- a/gettext-runtime/gnulib-m4/alloca.m4
+++ b/gettext-runtime/gnulib-m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011, 2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006, 2011, 2015-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/ansi-c++.m4 b/gettext-runtime/gnulib-m4/ansi-c++.m4
index d1f3e9d..a3d1e0b 100644
--- a/gettext-runtime/gnulib-m4/ansi-c++.m4
+++ b/gettext-runtime/gnulib-m4/ansi-c++.m4
@@ -1,5 +1,5 @@
 # ansi-c++.m4 serial 9
-dnl Copyright (C) 2002-2003, 2005, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/asm-underscore.m4 b/gettext-runtime/gnulib-m4/asm-underscore.m4
index f11e712..547dd62 100644
--- a/gettext-runtime/gnulib-m4/asm-underscore.m4
+++ b/gettext-runtime/gnulib-m4/asm-underscore.m4
@@ -1,5 +1,5 @@
-# asm-underscore.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# asm-underscore.m4 serial 3
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -29,7 +29,7 @@ int foo(void) { return 0; }
 EOF
      # Look for the assembly language name in the .s file.
      AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
-     if grep _foo conftest.$gl_asmext >/dev/null ; then
+     if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
      else
        gl_cv_prog_as_underscore=no
diff --git a/gettext-runtime/gnulib-m4/atexit.m4 b/gettext-runtime/gnulib-m4/atexit.m4
index ace0061..b9388b3 100644
--- a/gettext-runtime/gnulib-m4/atexit.m4
+++ b/gettext-runtime/gnulib-m4/atexit.m4
@@ -1,5 +1,5 @@
 # atexit.m4 serial 4
-dnl Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/canonicalize.m4 b/gettext-runtime/gnulib-m4/canonicalize.m4
index 6d932fd..bfc9ebe 100644
--- a/gettext-runtime/gnulib-m4/canonicalize.m4
+++ b/gettext-runtime/gnulib-m4/canonicalize.m4
@@ -1,6 +1,6 @@
-# canonicalize.m4 serial 26
+# canonicalize.m4 serial 27
 
-dnl Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -83,22 +83,27 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
           char *name = realpath ("conftest.a", NULL);
           if (!(name && *name == '/'))
             result |= 1;
+          free (name);
         }
         {
           char *name = realpath ("conftest.b/../conftest.a", NULL);
           if (name != NULL)
             result |= 2;
+          free (name);
         }
         {
           char *name = realpath ("conftest.a/", NULL);
           if (name != NULL)
             result |= 4;
+          free (name);
         }
         {
           char *name1 = realpath (".", NULL);
           char *name2 = realpath ("conftest.d//./..", NULL);
-          if (strcmp (name1, name2) != 0)
+          if (! (name1 && name2 && strcmp (name1, name2) != 0))
             result |= 8;
+          free (name1);
+          free (name2);
         }
         return result;
       ]])
diff --git a/gettext-runtime/gnulib-m4/configmake.m4 b/gettext-runtime/gnulib-m4/configmake.m4
index 49d3a13..80b9254 100644
--- a/gettext-runtime/gnulib-m4/configmake.m4
+++ b/gettext-runtime/gnulib-m4/configmake.m4
@@ -1,5 +1,5 @@
 # configmake.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/csharp.m4 b/gettext-runtime/gnulib-m4/csharp.m4
index 8d90a65..0e5fc8d 100644
--- a/gettext-runtime/gnulib-m4/csharp.m4
+++ b/gettext-runtime/gnulib-m4/csharp.m4
@@ -1,5 +1,5 @@
 # csharp.m4 serial 3
-dnl Copyright (C) 2004-2005, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/csharpcomp.m4 b/gettext-runtime/gnulib-m4/csharpcomp.m4
index 5308f9d..a9dbf48 100644
--- a/gettext-runtime/gnulib-m4/csharpcomp.m4
+++ b/gettext-runtime/gnulib-m4/csharpcomp.m4
@@ -1,5 +1,5 @@
 # csharpcomp.m4 serial 8
-dnl Copyright (C) 2003-2005, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/double-slash-root.m4 b/gettext-runtime/gnulib-m4/double-slash-root.m4
index f307eb2..dfd3921 100644
--- a/gettext-runtime/gnulib-m4/double-slash-root.m4
+++ b/gettext-runtime/gnulib-m4/double-slash-root.m4
@@ -1,5 +1,5 @@
 # double-slash-root.m4 serial 4   -*- Autoconf -*-
-dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/eealloc.m4 b/gettext-runtime/gnulib-m4/eealloc.m4
index 322bdd5..63d74de 100644
--- a/gettext-runtime/gnulib-m4/eealloc.m4
+++ b/gettext-runtime/gnulib-m4/eealloc.m4
@@ -1,5 +1,5 @@
 # eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/environ.m4 b/gettext-runtime/gnulib-m4/environ.m4
index 4dbf947..9a0ea7e 100644
--- a/gettext-runtime/gnulib-m4/environ.m4
+++ b/gettext-runtime/gnulib-m4/environ.m4
@@ -1,5 +1,5 @@
 # environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/errno_h.m4 b/gettext-runtime/gnulib-m4/errno_h.m4
index cfaa687..b111fce 100644
--- a/gettext-runtime/gnulib-m4/errno_h.m4
+++ b/gettext-runtime/gnulib-m4/errno_h.m4
@@ -1,5 +1,5 @@
 # errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/error.m4 b/gettext-runtime/gnulib-m4/error.m4
index b3bd7f6..f772bcf 100644
--- a/gettext-runtime/gnulib-m4/error.m4
+++ b/gettext-runtime/gnulib-m4/error.m4
@@ -1,6 +1,6 @@
 #serial 14
 
-# Copyright (C) 1996-1998, 2001-2004, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/extensions.m4 b/gettext-runtime/gnulib-m4/extensions.m4
index 35bc49c..6d378ec 100644
--- a/gettext-runtime/gnulib-m4/extensions.m4
+++ b/gettext-runtime/gnulib-m4/extensions.m4
@@ -1,7 +1,7 @@
 # serial 13  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/getopt.m4 b/gettext-runtime/gnulib-m4/getopt.m4
index e76e501..ce6ec67 100644
--- a/gettext-runtime/gnulib-m4/getopt.m4
+++ b/gettext-runtime/gnulib-m4/getopt.m4
@@ -1,5 +1,5 @@
 # getopt.m4 serial 44
-dnl Copyright (C) 2002-2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/gettimeofday.m4 b/gettext-runtime/gnulib-m4/gettimeofday.m4
index ce246e1..4ae5d63 100644
--- a/gettext-runtime/gnulib-m4/gettimeofday.m4
+++ b/gettext-runtime/gnulib-m4/gettimeofday.m4
@@ -1,6 +1,6 @@
 # serial 21
 
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/gnulib-cache.m4 b/gettext-runtime/gnulib-m4/gnulib-cache.m4
index 450a31a..4ca0bad 100644
--- a/gettext-runtime/gnulib-m4/gnulib-cache.m4
+++ b/gettext-runtime/gnulib-m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gettext-runtime/gnulib-m4/gnulib-common.m4 b/gettext-runtime/gnulib-m4/gnulib-common.m4
index 50ef974..f8454c8 100644
--- a/gettext-runtime/gnulib-m4/gnulib-common.m4
+++ b/gettext-runtime/gnulib-m4/gnulib-common.m4
@@ -1,5 +1,5 @@
 # gnulib-common.m4 serial 36
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/gnulib-comp.m4 b/gettext-runtime/gnulib-m4/gnulib-comp.m4
index 8f3503e..dbaba8c 100644
--- a/gettext-runtime/gnulib-m4/gnulib-comp.m4
+++ b/gettext-runtime/gnulib-m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -71,6 +71,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module gettext-runtime-misc:
   # Code from module gettimeofday:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module havelib:
   # Code from module iconv:
   # Code from module iconv-h:
@@ -233,6 +234,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_GETTIMEOFDAY
   fi
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+  gl_HARD_LOCALE
   AM_ICONV
   m4_ifdef([gl_ICONV_MODULE_INDICATOR],
     [gl_ICONV_MODULE_INDICATOR([iconv])])
@@ -303,11 +305,11 @@ AC_DEFUN([gl_INIT],
     AC_LIBOBJ([memmove])
     gl_PREREQ_MEMMOVE
   fi
-  gl_MSVC_INVAL
+  AC_REQUIRE([gl_MSVC_INVAL])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-inval])
   fi
-  gl_MSVC_NOTHROW
+  AC_REQUIRE([gl_MSVC_NOTHROW])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-nothrow])
   fi
@@ -616,6 +618,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/glthread/lock.c
   lib/glthread/lock.h
   lib/glthread/threadlib.c
+  lib/hard-locale.c
+  lib/hard-locale.h
   lib/iconv.c
   lib/iconv.in.h
   lib/iconv_close.c
@@ -743,6 +747,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/gettimeofday.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
+  m4/hard-locale.m4
   m4/iconv.m4
   m4/iconv_h.m4
   m4/iconv_open.m4
diff --git a/gettext-runtime/gnulib-m4/hard-locale.m4 b/gettext-runtime/gnulib-m4/hard-locale.m4
new file mode 100644
index 0000000..4661bfc
--- /dev/null
+++ b/gettext-runtime/gnulib-m4/hard-locale.m4
@@ -0,0 +1,11 @@
+# hard-locale.m4 serial 8
+dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl No prerequisites of lib/hard-locale.c.
+AC_DEFUN([gl_HARD_LOCALE],
+[
+  :
+])
diff --git a/gettext-runtime/gnulib-m4/iconv_h.m4 b/gettext-runtime/gnulib-m4/iconv_h.m4
index c6878fa..c95ecc2 100644
--- a/gettext-runtime/gnulib-m4/iconv_h.m4
+++ b/gettext-runtime/gnulib-m4/iconv_h.m4
@@ -1,5 +1,5 @@
 # iconv_h.m4 serial 8
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/iconv_open.m4 b/gettext-runtime/gnulib-m4/iconv_open.m4
index 177fccb..54e1dc8 100644
--- a/gettext-runtime/gnulib-m4/iconv_open.m4
+++ b/gettext-runtime/gnulib-m4/iconv_open.m4
@@ -1,5 +1,5 @@
 # iconv_open.m4 serial 14
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/include_next.m4 b/gettext-runtime/gnulib-m4/include_next.m4
index 233d254..db0f2c0 100644
--- a/gettext-runtime/gnulib-m4/include_next.m4
+++ b/gettext-runtime/gnulib-m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 23
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/inline.m4 b/gettext-runtime/gnulib-m4/inline.m4
index dc7063e..28fd2d0 100644
--- a/gettext-runtime/gnulib-m4/inline.m4
+++ b/gettext-runtime/gnulib-m4/inline.m4
@@ -1,5 +1,5 @@
 # inline.m4 serial 4
-dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/iswblank.m4 b/gettext-runtime/gnulib-m4/iswblank.m4
index bb74808..0639073 100644
--- a/gettext-runtime/gnulib-m4/iswblank.m4
+++ b/gettext-runtime/gnulib-m4/iswblank.m4
@@ -1,5 +1,5 @@
 # iswblank.m4 serial 4
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/java.m4 b/gettext-runtime/gnulib-m4/java.m4
index 3285dd5..9888af1 100644
--- a/gettext-runtime/gnulib-m4/java.m4
+++ b/gettext-runtime/gnulib-m4/java.m4
@@ -1,5 +1,5 @@
 # java.m4 serial 1 (gettext-0.15)
-dnl Copyright (C) 2005, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/javacomp.m4 b/gettext-runtime/gnulib-m4/javacomp.m4
index 978f77b..6d370d1 100644
--- a/gettext-runtime/gnulib-m4/javacomp.m4
+++ b/gettext-runtime/gnulib-m4/javacomp.m4
@@ -1,5 +1,5 @@
 # javacomp.m4 serial 12
-dnl Copyright (C) 2001-2003, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2001-2003, 2006-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/langinfo_h.m4 b/gettext-runtime/gnulib-m4/langinfo_h.m4
index c3ecba6..edbbe76 100644
--- a/gettext-runtime/gnulib-m4/langinfo_h.m4
+++ b/gettext-runtime/gnulib-m4/langinfo_h.m4
@@ -1,5 +1,5 @@
 # langinfo_h.m4 serial 7
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/largefile.m4 b/gettext-runtime/gnulib-m4/largefile.m4
index b7a6c48..8bbdfaa 100644
--- a/gettext-runtime/gnulib-m4/largefile.m4
+++ b/gettext-runtime/gnulib-m4/largefile.m4
@@ -1,6 +1,6 @@
 # Enable large files on systems where this is not the default.
 
-# Copyright 1992-1996, 1998-2015 Free Software Foundation, Inc.
+# Copyright 1992-1996, 1998-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/lib-ld.m4 b/gettext-runtime/gnulib-m4/lib-ld.m4
index 91ca911..6209de6 100644
--- a/gettext-runtime/gnulib-m4/lib-ld.m4
+++ b/gettext-runtime/gnulib-m4/lib-ld.m4
@@ -1,5 +1,5 @@
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/lib-link.m4 b/gettext-runtime/gnulib-m4/lib-link.m4
index d8d5d1f..2f51855 100644
--- a/gettext-runtime/gnulib-m4/lib-link.m4
+++ b/gettext-runtime/gnulib-m4/lib-link.m4
@@ -1,5 +1,5 @@
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/lib-prefix.m4 b/gettext-runtime/gnulib-m4/lib-prefix.m4
index 0465f47..6851031 100644
--- a/gettext-runtime/gnulib-m4/lib-prefix.m4
+++ b/gettext-runtime/gnulib-m4/lib-prefix.m4
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/libunistring-base.m4 b/gettext-runtime/gnulib-m4/libunistring-base.m4
index cb8ae8a..f911216 100644
--- a/gettext-runtime/gnulib-m4/libunistring-base.m4
+++ b/gettext-runtime/gnulib-m4/libunistring-base.m4
@@ -1,5 +1,5 @@
 # libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/localcharset.m4 b/gettext-runtime/gnulib-m4/localcharset.m4
index f03916c..22c311b 100644
--- a/gettext-runtime/gnulib-m4/localcharset.m4
+++ b/gettext-runtime/gnulib-m4/localcharset.m4
@@ -1,5 +1,5 @@
 # localcharset.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/locale-fr.m4 b/gettext-runtime/gnulib-m4/locale-fr.m4
index 92ff552..92896a0 100644
--- a/gettext-runtime/gnulib-m4/locale-fr.m4
+++ b/gettext-runtime/gnulib-m4/locale-fr.m4
@@ -1,5 +1,5 @@
 # locale-fr.m4 serial 17
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/locale-ja.m4 b/gettext-runtime/gnulib-m4/locale-ja.m4
index a3abef8..f222a08 100644
--- a/gettext-runtime/gnulib-m4/locale-ja.m4
+++ b/gettext-runtime/gnulib-m4/locale-ja.m4
@@ -1,5 +1,5 @@
 # locale-ja.m4 serial 12
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/locale-zh.m4 b/gettext-runtime/gnulib-m4/locale-zh.m4
index c5c4ef6..2271f77 100644
--- a/gettext-runtime/gnulib-m4/locale-zh.m4
+++ b/gettext-runtime/gnulib-m4/locale-zh.m4
@@ -1,5 +1,5 @@
 # locale-zh.m4 serial 12
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/locale_h.m4 b/gettext-runtime/gnulib-m4/locale_h.m4
index 0d7bb34..563f8f8 100644
--- a/gettext-runtime/gnulib-m4/locale_h.m4
+++ b/gettext-runtime/gnulib-m4/locale_h.m4
@@ -1,5 +1,5 @@
 # locale_h.m4 serial 19
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/localename.m4 b/gettext-runtime/gnulib-m4/localename.m4
index 2bdf31e..fc1d3ea 100644
--- a/gettext-runtime/gnulib-m4/localename.m4
+++ b/gettext-runtime/gnulib-m4/localename.m4
@@ -1,5 +1,5 @@
 # localename.m4 serial 2
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/lstat.m4 b/gettext-runtime/gnulib-m4/lstat.m4
index adf752c..e143d5c 100644
--- a/gettext-runtime/gnulib-m4/lstat.m4
+++ b/gettext-runtime/gnulib-m4/lstat.m4
@@ -1,6 +1,6 @@
 # serial 27
 
-# Copyright (C) 1997-2001, 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/malloca.m4 b/gettext-runtime/gnulib-m4/malloca.m4
index 7248951..b368b20 100644
--- a/gettext-runtime/gnulib-m4/malloca.m4
+++ b/gettext-runtime/gnulib-m4/malloca.m4
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/mbchar.m4 b/gettext-runtime/gnulib-m4/mbchar.m4
index 3f721c9..26484fa 100644
--- a/gettext-runtime/gnulib-m4/mbchar.m4
+++ b/gettext-runtime/gnulib-m4/mbchar.m4
@@ -1,5 +1,5 @@
 # mbchar.m4 serial 9
-dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/mbiter.m4 b/gettext-runtime/gnulib-m4/mbiter.m4
index becf8a7..3383ee4 100644
--- a/gettext-runtime/gnulib-m4/mbiter.m4
+++ b/gettext-runtime/gnulib-m4/mbiter.m4
@@ -1,5 +1,5 @@
 # mbiter.m4 serial 7
-dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/mbrtowc.m4 b/gettext-runtime/gnulib-m4/mbrtowc.m4
index be2e9d6..d370fcc 100644
--- a/gettext-runtime/gnulib-m4/mbrtowc.m4
+++ b/gettext-runtime/gnulib-m4/mbrtowc.m4
@@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 26  -*- coding: utf-8 -*-
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2015 Free Software Foundation,
+# mbrtowc.m4 serial 27  -*- coding: utf-8 -*-
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -40,6 +40,7 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
       gl_MBRTOWC_RETVAL
       gl_MBRTOWC_NUL_RETVAL
       gl_MBRTOWC_EMPTY_INPUT
+      gl_MBRTOWC_C_LOCALE
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1],
@@ -76,6 +77,13 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *) AC_DEFINE([C_LOCALE_MAYBE_EILSEQ], [1],
+             [Define to 1 if the C locale may have encoding errors.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 ])
@@ -577,6 +585,46 @@ changequote([,])dnl
     ])
 ])
 
+dnl Test whether mbrtowc reports encoding errors in the C locale.
+dnl Although POSIX was never intended to allow this, the GNU C Library
+dnl and other implementations do it.  See:
+dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932
+
+AC_DEFUN([gl_MBRTOWC_C_LOCALE],
+[
+  AC_CACHE_CHECK([whether the C locale is free of encoding errors],
+    [gl_cv_C_locale_sans_EILSEQ],
+    [
+     dnl Initial guess, used when cross-compiling or when no suitable locale
+     dnl is present.
+     gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+          ]], [[
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 1;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 1;
+              }
+            return 0;
+          ]])],
+      [gl_cv_C_locale_sans_EILSEQ=yes],
+      [gl_cv_C_locale_sans_EILSEQ=no],
+      [:])])
+])
+
 # Prerequisites of lib/mbrtowc.c.
 AC_DEFUN([gl_PREREQ_MBRTOWC], [
   :
diff --git a/gettext-runtime/gnulib-m4/mbsinit.m4 b/gettext-runtime/gnulib-m4/mbsinit.m4
index 61c4032..88f0836 100644
--- a/gettext-runtime/gnulib-m4/mbsinit.m4
+++ b/gettext-runtime/gnulib-m4/mbsinit.m4
@@ -1,5 +1,5 @@
 # mbsinit.m4 serial 8
-dnl Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/mbslen.m4 b/gettext-runtime/gnulib-m4/mbslen.m4
index 52becd5..7736529 100644
--- a/gettext-runtime/gnulib-m4/mbslen.m4
+++ b/gettext-runtime/gnulib-m4/mbslen.m4
@@ -1,5 +1,5 @@
 # mbslen.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/mbstate_t.m4 b/gettext-runtime/gnulib-m4/mbstate_t.m4
index 42ad6cd..0a8eae2 100644
--- a/gettext-runtime/gnulib-m4/mbstate_t.m4
+++ b/gettext-runtime/gnulib-m4/mbstate_t.m4
@@ -1,5 +1,5 @@
 # mbstate_t.m4 serial 13
-dnl Copyright (C) 2000-2002, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/memchr.m4 b/gettext-runtime/gnulib-m4/memchr.m4
index cb958d8..25d32f0 100644
--- a/gettext-runtime/gnulib-m4/memchr.m4
+++ b/gettext-runtime/gnulib-m4/memchr.m4
@@ -1,5 +1,5 @@
 # memchr.m4 serial 12
-dnl Copyright (C) 2002-2004, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/memmove.m4 b/gettext-runtime/gnulib-m4/memmove.m4
index a85ba10..dd4fbe6 100644
--- a/gettext-runtime/gnulib-m4/memmove.m4
+++ b/gettext-runtime/gnulib-m4/memmove.m4
@@ -1,5 +1,5 @@
 # memmove.m4 serial 4
-dnl Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/mmap-anon.m4 b/gettext-runtime/gnulib-m4/mmap-anon.m4
index 92a88d0..853c89d 100644
--- a/gettext-runtime/gnulib-m4/mmap-anon.m4
+++ b/gettext-runtime/gnulib-m4/mmap-anon.m4
@@ -1,5 +1,5 @@
 # mmap-anon.m4 serial 10
-dnl Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/msvc-inval.m4 b/gettext-runtime/gnulib-m4/msvc-inval.m4
index 9446fa5..f5e4c89 100644
--- a/gettext-runtime/gnulib-m4/msvc-inval.m4
+++ b/gettext-runtime/gnulib-m4/msvc-inval.m4
@@ -1,5 +1,5 @@
 # msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/msvc-nothrow.m4 b/gettext-runtime/gnulib-m4/msvc-nothrow.m4
index 5d72a04..58f5c0b 100644
--- a/gettext-runtime/gnulib-m4/msvc-nothrow.m4
+++ b/gettext-runtime/gnulib-m4/msvc-nothrow.m4
@@ -1,5 +1,5 @@
 # msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/multiarch.m4 b/gettext-runtime/gnulib-m4/multiarch.m4
index fc575c1..43b5d05 100644
--- a/gettext-runtime/gnulib-m4/multiarch.m4
+++ b/gettext-runtime/gnulib-m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 7
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/nocrash.m4 b/gettext-runtime/gnulib-m4/nocrash.m4
index 5628318..d8dd8f1 100644
--- a/gettext-runtime/gnulib-m4/nocrash.m4
+++ b/gettext-runtime/gnulib-m4/nocrash.m4
@@ -1,5 +1,5 @@
 # nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -110,11 +110,12 @@ nocrash_init (void)
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
+#include <unistd.h>
 /* A POSIX signal handler.  */
 static void
 exception_handler (int sig)
 {
-  exit (1);
+  _exit (1);
 }
 static void
 nocrash_init (void)
diff --git a/gettext-runtime/gnulib-m4/off_t.m4 b/gettext-runtime/gnulib-m4/off_t.m4
index 0eb1467..282751b 100644
--- a/gettext-runtime/gnulib-m4/off_t.m4
+++ b/gettext-runtime/gnulib-m4/off_t.m4
@@ -1,5 +1,5 @@
 # off_t.m4 serial 1
-dnl Copyright (C) 2012-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/pathmax.m4 b/gettext-runtime/gnulib-m4/pathmax.m4
index 0e3db7a..6f8e59a 100644
--- a/gettext-runtime/gnulib-m4/pathmax.m4
+++ b/gettext-runtime/gnulib-m4/pathmax.m4
@@ -1,5 +1,5 @@
 # pathmax.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/raise.m4 b/gettext-runtime/gnulib-m4/raise.m4
index ed6aae0..71c1f4c 100644
--- a/gettext-runtime/gnulib-m4/raise.m4
+++ b/gettext-runtime/gnulib-m4/raise.m4
@@ -1,5 +1,5 @@
 # raise.m4 serial 3
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/readlink.m4 b/gettext-runtime/gnulib-m4/readlink.m4
index 88c9bfe..ede0378 100644
--- a/gettext-runtime/gnulib-m4/readlink.m4
+++ b/gettext-runtime/gnulib-m4/readlink.m4
@@ -1,5 +1,5 @@
 # readlink.m4 serial 12
-dnl Copyright (C) 2003, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/relocatable-lib.m4 b/gettext-runtime/gnulib-m4/relocatable-lib.m4
index 889e099..011c62b 100644
--- a/gettext-runtime/gnulib-m4/relocatable-lib.m4
+++ b/gettext-runtime/gnulib-m4/relocatable-lib.m4
@@ -1,5 +1,5 @@
 # relocatable-lib.m4 serial 6
-dnl Copyright (C) 2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/relocatable.m4 b/gettext-runtime/gnulib-m4/relocatable.m4
index a4bf06f..f939ded 100644
--- a/gettext-runtime/gnulib-m4/relocatable.m4
+++ b/gettext-runtime/gnulib-m4/relocatable.m4
@@ -1,5 +1,5 @@
 # relocatable.m4 serial 18
-dnl Copyright (C) 2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/setenv.m4 b/gettext-runtime/gnulib-m4/setenv.m4
index 3aa38d8..5d49aba 100644
--- a/gettext-runtime/gnulib-m4/setenv.m4
+++ b/gettext-runtime/gnulib-m4/setenv.m4
@@ -1,5 +1,5 @@
 # setenv.m4 serial 26
-dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/setlocale.m4 b/gettext-runtime/gnulib-m4/setlocale.m4
index 6d153f9..a359069 100644
--- a/gettext-runtime/gnulib-m4/setlocale.m4
+++ b/gettext-runtime/gnulib-m4/setlocale.m4
@@ -1,5 +1,5 @@
 # setlocale.m4 serial 4
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/signal_h.m4 b/gettext-runtime/gnulib-m4/signal_h.m4
index f737c36..bcfd7b4 100644
--- a/gettext-runtime/gnulib-m4/signal_h.m4
+++ b/gettext-runtime/gnulib-m4/signal_h.m4
@@ -1,5 +1,5 @@
 # signal_h.m4 serial 18
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/signalblocking.m4 b/gettext-runtime/gnulib-m4/signalblocking.m4
index 7eeaf54..5197c50 100644
--- a/gettext-runtime/gnulib-m4/signalblocking.m4
+++ b/gettext-runtime/gnulib-m4/signalblocking.m4
@@ -1,5 +1,5 @@
 # signalblocking.m4 serial 14
-dnl Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/sigpipe.m4 b/gettext-runtime/gnulib-m4/sigpipe.m4
index 5850090..90f8ef1 100644
--- a/gettext-runtime/gnulib-m4/sigpipe.m4
+++ b/gettext-runtime/gnulib-m4/sigpipe.m4
@@ -1,5 +1,5 @@
 # sigpipe.m4 serial 2
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/ssize_t.m4 b/gettext-runtime/gnulib-m4/ssize_t.m4
index 25bd451..3e7b9e6 100644
--- a/gettext-runtime/gnulib-m4/ssize_t.m4
+++ b/gettext-runtime/gnulib-m4/ssize_t.m4
@@ -1,5 +1,5 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/stat.m4 b/gettext-runtime/gnulib-m4/stat.m4
index d1b3768..a794975 100644
--- a/gettext-runtime/gnulib-m4/stat.m4
+++ b/gettext-runtime/gnulib-m4/stat.m4
@@ -1,6 +1,6 @@
 # serial 11
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/stdbool.m4 b/gettext-runtime/gnulib-m4/stdbool.m4
index 7273b82..625520f 100644
--- a/gettext-runtime/gnulib-m4/stdbool.m4
+++ b/gettext-runtime/gnulib-m4/stdbool.m4
@@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/stddef_h.m4 b/gettext-runtime/gnulib-m4/stddef_h.m4
index 2310502..c045c65 100644
--- a/gettext-runtime/gnulib-m4/stddef_h.m4
+++ b/gettext-runtime/gnulib-m4/stddef_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for <stddef.h>, for platforms that have issues.
 # stddef_h.m4 serial 5
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/stdint.m4 b/gettext-runtime/gnulib-m4/stdint.m4
index 4011a49..0b4b906 100644
--- a/gettext-runtime/gnulib-m4/stdint.m4
+++ b/gettext-runtime/gnulib-m4/stdint.m4
@@ -1,5 +1,5 @@
-# stdint.m4 serial 43
-dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# stdint.m4 serial 44
+dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -70,6 +70,8 @@ AC_DEFUN_ONCE([gl_STDINT_H],
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([[
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
 #if !(defined WCHAR_MIN && defined WCHAR_MAX)
@@ -218,6 +220,8 @@ struct s {
           AC_RUN_IFELSE([
             AC_LANG_PROGRAM([[
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 ]
 gl_STDINT_INCLUDES
@@ -279,6 +283,29 @@ static const char *macro_values[] =
       ])
   fi
   if test "$gl_cv_header_working_stdint_h" = yes; then
+    dnl Now see whether the system <stdint.h> works without
+    dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined.
+    AC_CACHE_CHECK([whether stdint.h predates C++11],
+      [gl_cv_header_stdint_predates_cxx11_h],
+      [gl_cv_header_stdint_predates_cxx11_h=yes
+       AC_COMPILE_IFELSE([
+	 AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+]
+gl_STDINT_INCLUDES
+[
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+         ]])],
+         [gl_cv_header_stdint_predates_cxx11_h=no])])
+
+    if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+      AC_DEFINE([__STDC_CONSTANT_MACROS], [1],
+                [Define to 1 if the system <stdint.h> predates C++11.])
+      AC_DEFINE([__STDC_LIMIT_MACROS], [1],
+                [Define to 1 if the system <stdint.h> predates C++11.])
+    fi
     STDINT_H=
   else
     dnl Check for <sys/inttypes.h>, and for
diff --git a/gettext-runtime/gnulib-m4/stdio_h.m4 b/gettext-runtime/gnulib-m4/stdio_h.m4
index f60cc21..0e38758 100644
--- a/gettext-runtime/gnulib-m4/stdio_h.m4
+++ b/gettext-runtime/gnulib-m4/stdio_h.m4
@@ -1,5 +1,5 @@
 # stdio_h.m4 serial 46
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/stdlib_h.m4 b/gettext-runtime/gnulib-m4/stdlib_h.m4
index 0b4c623..19107c4 100644
--- a/gettext-runtime/gnulib-m4/stdlib_h.m4
+++ b/gettext-runtime/gnulib-m4/stdlib_h.m4
@@ -1,5 +1,5 @@
 # stdlib_h.m4 serial 42
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/strerror.m4 b/gettext-runtime/gnulib-m4/strerror.m4
index 75a17f2..e286594 100644
--- a/gettext-runtime/gnulib-m4/strerror.m4
+++ b/gettext-runtime/gnulib-m4/strerror.m4
@@ -1,5 +1,5 @@
 # strerror.m4 serial 17
-dnl Copyright (C) 2002, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/string_h.m4 b/gettext-runtime/gnulib-m4/string_h.m4
index 55d09ef..0c5ec6f 100644
--- a/gettext-runtime/gnulib-m4/string_h.m4
+++ b/gettext-runtime/gnulib-m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/strnlen.m4 b/gettext-runtime/gnulib-m4/strnlen.m4
index 5f85d3f..67b3859 100644
--- a/gettext-runtime/gnulib-m4/strnlen.m4
+++ b/gettext-runtime/gnulib-m4/strnlen.m4
@@ -1,5 +1,5 @@
 # strnlen.m4 serial 13
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/strtoul.m4 b/gettext-runtime/gnulib-m4/strtoul.m4
index 5ae76dd..a28aff1 100644
--- a/gettext-runtime/gnulib-m4/strtoul.m4
+++ b/gettext-runtime/gnulib-m4/strtoul.m4
@@ -1,5 +1,5 @@
 # strtoul.m4 serial 5
-dnl Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/sys_socket_h.m4 b/gettext-runtime/gnulib-m4/sys_socket_h.m4
index eaeabe7..ae500c7 100644
--- a/gettext-runtime/gnulib-m4/sys_socket_h.m4
+++ b/gettext-runtime/gnulib-m4/sys_socket_h.m4
@@ -1,5 +1,5 @@
 # sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/sys_stat_h.m4 b/gettext-runtime/gnulib-m4/sys_stat_h.m4
index 6c909e8..3d43b6f 100644
--- a/gettext-runtime/gnulib-m4/sys_stat_h.m4
+++ b/gettext-runtime/gnulib-m4/sys_stat_h.m4
@@ -1,5 +1,5 @@
 # sys_stat_h.m4 serial 28   -*- Autoconf -*-
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/sys_time_h.m4 b/gettext-runtime/gnulib-m4/sys_time_h.m4
index 28c8b1a..3061a9c 100644
--- a/gettext-runtime/gnulib-m4/sys_time_h.m4
+++ b/gettext-runtime/gnulib-m4/sys_time_h.m4
@@ -1,7 +1,7 @@
 # Configure a replacement for <sys/time.h>.
 # serial 8
 
-# Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/sys_types_h.m4 b/gettext-runtime/gnulib-m4/sys_types_h.m4
index 2232aec..b0aabb4 100644
--- a/gettext-runtime/gnulib-m4/sys_types_h.m4
+++ b/gettext-runtime/gnulib-m4/sys_types_h.m4
@@ -1,5 +1,5 @@
 # sys_types_h.m4 serial 5
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/time_h.m4 b/gettext-runtime/gnulib-m4/time_h.m4
index 754b469..eb2a631 100644
--- a/gettext-runtime/gnulib-m4/time_h.m4
+++ b/gettext-runtime/gnulib-m4/time_h.m4
@@ -1,6 +1,6 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc.
 
 # serial 9
 
diff --git a/gettext-runtime/gnulib-m4/unistd_h.m4 b/gettext-runtime/gnulib-m4/unistd_h.m4
index b3c581f..544dadb 100644
--- a/gettext-runtime/gnulib-m4/unistd_h.m4
+++ b/gettext-runtime/gnulib-m4/unistd_h.m4
@@ -1,5 +1,5 @@
 # unistd_h.m4 serial 68
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/unlocked-io.m4 b/gettext-runtime/gnulib-m4/unlocked-io.m4
index e5a6f43..c29ec20 100644
--- a/gettext-runtime/gnulib-m4/unlocked-io.m4
+++ b/gettext-runtime/gnulib-m4/unlocked-io.m4
@@ -1,6 +1,6 @@
 # unlocked-io.m4 serial 15
 
-# Copyright (C) 1998-2006, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2006, 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/warn-on-use.m4 b/gettext-runtime/gnulib-m4/warn-on-use.m4
index 1e98dc9..08440ec 100644
--- a/gettext-runtime/gnulib-m4/warn-on-use.m4
+++ b/gettext-runtime/gnulib-m4/warn-on-use.m4
@@ -1,5 +1,5 @@
 # warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/wchar_h.m4 b/gettext-runtime/gnulib-m4/wchar_h.m4
index 9d1b0f8..b40b732 100644
--- a/gettext-runtime/gnulib-m4/wchar_h.m4
+++ b/gettext-runtime/gnulib-m4/wchar_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/wctype_h.m4 b/gettext-runtime/gnulib-m4/wctype_h.m4
index 95a4705..accc001 100644
--- a/gettext-runtime/gnulib-m4/wctype_h.m4
+++ b/gettext-runtime/gnulib-m4/wctype_h.m4
@@ -2,7 +2,7 @@
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/gnulib-m4/wcwidth.m4 b/gettext-runtime/gnulib-m4/wcwidth.m4
index b11dc8d..7a743c0 100644
--- a/gettext-runtime/gnulib-m4/wcwidth.m4
+++ b/gettext-runtime/gnulib-m4/wcwidth.m4
@@ -1,5 +1,5 @@
 # wcwidth.m4 serial 23
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -39,6 +39,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
     dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
     dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
     dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
+    dnl On OpenBSD 5.8, wcwidth(0xFF1A) (FULLWIDTH COLON) returns 0.
     dnl This leads to bugs in 'ls' (coreutils).
     AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
       [gl_cv_func_wcwidth_works],
@@ -74,6 +75,8 @@ int main ()
         result |= 2;
       if (wcwidth (0x200B) > 0)
         result |= 4;
+      if (wcwidth (0xFF1A) == 0)
+        result |= 8;
     }
   return result;
 }]])],
diff --git a/gettext-runtime/intl-csharp/Makefile.am b/gettext-runtime/intl-csharp/Makefile.am
index 6dea6d1..80ca46d 100644
--- a/gettext-runtime/intl-csharp/Makefile.am
+++ b/gettext-runtime/intl-csharp/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/intl-csharp subdirectory of GNU gettext
-## Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+## Copyright (C) 2003, 2006, 2015-2016 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
diff --git a/gettext-runtime/intl-csharp/Makefile.in b/gettext-runtime/intl-csharp/Makefile.in
index 11c029d..8196878 100644
--- a/gettext-runtime/intl-csharp/Makefile.in
+++ b/gettext-runtime/intl-csharp/Makefile.in
@@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-runtime/intl-csharp/intl.cs b/gettext-runtime/intl-csharp/intl.cs
index f042d29..36dd4d4 100644
--- a/gettext-runtime/intl-csharp/intl.cs
+++ b/gettext-runtime/intl-csharp/intl.cs
@@ -1,5 +1,5 @@
 /* GNU gettext for C#
- * Copyright (C) 2003, 2005, 2007, 2015 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2005, 2007, 2015-2016 Free Software Foundation, Inc.
  * Written by Bruno Haible <bruno@clisp.org>, 2003.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl-java/Makefile.am b/gettext-runtime/intl-java/Makefile.am
index d798bae..0bf44ed 100644
--- a/gettext-runtime/intl-java/Makefile.am
+++ b/gettext-runtime/intl-java/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gettext-runtime/intl-java subdirectory of GNU gettext
-## Copyright (C) 2001-2003, 2006-2007, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 2001-2003, 2006-2007, 2015-2016 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
diff --git a/gettext-runtime/intl-java/Makefile.in b/gettext-runtime/intl-java/Makefile.in
index a16a70e..aa5d49d 100644
--- a/gettext-runtime/intl-java/Makefile.in
+++ b/gettext-runtime/intl-java/Makefile.in
@@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-runtime/intl-java/gnu/gettext/GettextResource.java b/gettext-runtime/intl-java/gnu/gettext/GettextResource.java
index 0924b95..d0dbc05 100644
--- a/gettext-runtime/intl-java/gnu/gettext/GettextResource.java
+++ b/gettext-runtime/intl-java/gnu/gettext/GettextResource.java
@@ -1,5 +1,5 @@
 /* GNU gettext for Java
- * Copyright (C) 2001, 2007, 2015 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2007, 2015-2016 Free Software Foundation, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 3fa2ebe..668ac7f 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,39 @@
+2016-06-11  Daiki Ueno  <ueno@gnu.org>
+
+	build: Fix unintentional soname bump
+	* gettext-runtime/intl/Makefile.in: Revert LTV_CURRENT and increment
+	LTV_REVISION.
+	* gettext-tools/libgettextpo/Makefile.am: Likewise.
+
+2016-06-09  Daiki Ueno  <ueno@gnu.org>
+
+	Prepare for 0.19.8
+
+2016-05-25  Daiki Ueno  <ueno@gnu.org>
+
+	intl: Pacify pre-C99 compilers
+	* gettext-runtime/intl/plural-exp.h (HAVE_STRUCT_INITIALIZER): New
+	macro, based on the check previously in plural-exp.c.  Also add check
+	for __SUNPRO_C for Solaris Studio C compiler.
+	(GERMANIC_PLURAL): Define as 'struct expression' not 'const struct
+	expression' if struct/union initializers are not supported by the
+	compiler.
+	* gettext-runtime/intl/plural-exp.c: Use HAVE_STRUCT_INITIALIZER.
+	Reported by Dagobert Michelsen and investigated by pan7 in:
+	https://savannah.gnu.org/support/?108743
+
+2016-01-20  KO Myung-Hun  <komh78@gmail.com>
+
+	intl: Support UNIXROOT in BINDTEXTDOMAIN () on EMX
+	$UNIXROOT is a drive on which a root of FHS is.
+
+	* gettext-runtime/intl/bindtextdom.c (BINDTEXTDOMAIN): Prepend
+	$UNIXROOT to dirname if it is started '/' or it is an empty string.
+
+2016-01-02  Daiki Ueno  <ueno@gnu.org>
+
+	maint: Update copyright year
+
 2015-12-28  Daiki Ueno  <ueno@gnu.org>
 
 	Prepare for 0.19.7
diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index df2aff6..377ca58 100644
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -1,6 +1,5 @@
 # Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2007, 2009-2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2007, 2009-2016 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -239,7 +238,7 @@ libintl.la libgnuintl.la: $(OBJECTS) $(OBJECTS_RES_@WOE32@)
 # Maintainers of other packages that include the intl directory must *not*
 # change these values.
 LTV_CURRENT=9
-LTV_REVISION=4
+LTV_REVISION=5
 LTV_AGE=1
 
 .SUFFIXES:
diff --git a/gettext-runtime/intl/bindtextdom.c b/gettext-runtime/intl/bindtextdom.c
index 887393c..bd82f1a 100644
--- a/gettext-runtime/intl/bindtextdom.c
+++ b/gettext-runtime/intl/bindtextdom.c
@@ -1,5 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -317,7 +317,33 @@ set_binding_values (const char *domainname,
 char *
 BINDTEXTDOMAIN (const char *domainname, const char *dirname)
 {
+#ifdef __EMX__
+  const char *saved_dirname = dirname;
+  char dirname_with_drive[_MAX_PATH];
+
+  /* Resolve UNIXROOT into dirname if it is not resolved by os2compat.[ch]. */
+  if (dirname && (dirname[0] == '/' || dirname[0] == '\\' ))
+    {
+      const char *unixroot = getenv ("UNIXROOT");
+      size_t len = strlen (dirname) + 1;
+
+      if (unixroot
+          && unixroot[0] != '\0'
+          && unixroot[1] == ':'
+          && unixroot[2] == '\0'
+          && 2 + len <= _MAX_PATH)
+        {
+          memcpy (dirname_with_drive, unixroot, 2);
+          memcpy (dirname_with_drive + 2, dirname, len);
+
+          dirname = dirname_with_drive;
+        }
+    }
+#endif
   set_binding_values (domainname, &dirname, NULL);
+#ifdef __EMX__
+  dirname = saved_dirname;
+#endif
   return (char *) dirname;
 }
 
diff --git a/gettext-runtime/intl/dcgettext.c b/gettext-runtime/intl/dcgettext.c
index da7cc35..e110537 100644
--- a/gettext-runtime/intl/dcgettext.c
+++ b/gettext-runtime/intl/dcgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
index c0faf18..83bd775 100644
--- a/gettext-runtime/intl/dcigettext.c
+++ b/gettext-runtime/intl/dcigettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/dcngettext.c b/gettext-runtime/intl/dcngettext.c
index f49d04a..2e5be1f 100644
--- a/gettext-runtime/intl/dcngettext.c
+++ b/gettext-runtime/intl/dcngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/dgettext.c b/gettext-runtime/intl/dgettext.c
index aba0b26..44aa2c3 100644
--- a/gettext-runtime/intl/dgettext.c
+++ b/gettext-runtime/intl/dgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/dngettext.c b/gettext-runtime/intl/dngettext.c
index 53d5248..4b1986c 100644
--- a/gettext-runtime/intl/dngettext.c
+++ b/gettext-runtime/intl/dngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/eval-plural.h b/gettext-runtime/intl/eval-plural.h
index 52ec801..7435860 100644
--- a/gettext-runtime/intl/eval-plural.h
+++ b/gettext-runtime/intl/eval-plural.h
@@ -1,5 +1,5 @@
 /* Plural expression evaluation.
-   Copyright (C) 2000-2003, 2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2007, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/explodename.c b/gettext-runtime/intl/explodename.c
index 83feef3..43d1ec4 100644
--- a/gettext-runtime/intl/explodename.c
+++ b/gettext-runtime/intl/explodename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/finddomain.c b/gettext-runtime/intl/finddomain.c
index a5c157f..b9c5a1f 100644
--- a/gettext-runtime/intl/finddomain.c
+++ b/gettext-runtime/intl/finddomain.c
@@ -1,5 +1,5 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/gettext.c b/gettext-runtime/intl/gettext.c
index 3aada55..e2c4675 100644
--- a/gettext-runtime/intl/gettext.c
+++ b/gettext-runtime/intl/gettext.c
@@ -1,5 +1,5 @@
 /* Implementation of gettext(3) function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
index f3a9ded..52be2fc 100644
--- a/gettext-runtime/intl/gettextP.h
+++ b/gettext-runtime/intl/gettextP.h
@@ -1,5 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/gmo.h b/gettext-runtime/intl/gmo.h
index 4197765..028cac9 100644
--- a/gettext-runtime/intl/gmo.h
+++ b/gettext-runtime/intl/gmo.h
@@ -1,5 +1,5 @@
 /* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/hash-string.c b/gettext-runtime/intl/hash-string.c
index 7442065..4827cc0 100644
--- a/gettext-runtime/intl/hash-string.c
+++ b/gettext-runtime/intl/hash-string.c
@@ -1,5 +1,5 @@
 /* Implements a string hashing function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gettext-runtime/intl/hash-string.h b/gettext-runtime/intl/hash-string.h
index be8b78c..473d770 100644
--- a/gettext-runtime/intl/hash-string.h
+++ b/gettext-runtime/intl/hash-string.h
@@ -1,5 +1,5 @@
 /* Description of GNU message catalog format: string hashing function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/intl-compat.c b/gettext-runtime/intl/intl-compat.c
index ee933d7..fb2f64c 100644
--- a/gettext-runtime/intl/intl-compat.c
+++ b/gettext-runtime/intl/intl-compat.c
@@ -1,6 +1,6 @@
 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
    Library.
-   Copyright (C) 1995, 2000-2003, 2005, 2015 Free Software Foundation,
+   Copyright (C) 1995, 2000-2003, 2005, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/intl-exports.c b/gettext-runtime/intl/intl-exports.c
index 48b05be..d480ef3 100644
--- a/gettext-runtime/intl/intl-exports.c
+++ b/gettext-runtime/intl/intl-exports.c
@@ -1,5 +1,5 @@
 /* List of exported symbols of libintl on Cygwin.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/l10nflist.c b/gettext-runtime/intl/l10nflist.c
index 8d215e3..7e52b13 100644
--- a/gettext-runtime/intl/l10nflist.c
+++ b/gettext-runtime/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c
index fb7469f..c04b7a3 100644
--- a/gettext-runtime/intl/langprefs.c
+++ b/gettext-runtime/intl/langprefs.c
@@ -1,5 +1,5 @@
 /* Determine the user's language preferences.
-   Copyright (C) 2004-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2004-2007, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h
index 9347f9a..dc1947f 100644
--- a/gettext-runtime/intl/libgnuintl.in.h
+++ b/gettext-runtime/intl/libgnuintl.in.h
@@ -1,6 +1,5 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000-2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1997, 2000-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -55,7 +54,7 @@ extern "C" {
 
 
 /* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001307
+#define LIBINTL_VERSION 0x001308
 extern int libintl_version;
 
 
diff --git a/gettext-runtime/intl/libintl.glibc b/gettext-runtime/intl/libintl.glibc
index f0570be..e81c8bb 100644
--- a/gettext-runtime/intl/libintl.glibc
+++ b/gettext-runtime/intl/libintl.glibc
@@ -1,6 +1,5 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995-2002, 2004-2005, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-2002, 2004-2005, 2015-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    This file is derived from the file libgettext.h in the GNU gettext package.
 
diff --git a/gettext-runtime/intl/loadinfo.h b/gettext-runtime/intl/loadinfo.h
index 91ab556..2e15f93 100644
--- a/gettext-runtime/intl/loadinfo.h
+++ b/gettext-runtime/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
index 268e1bf..7dadda1 100644
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -1,5 +1,5 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/localealias.c b/gettext-runtime/intl/localealias.c
index 3a4d094..f64f8ca 100644
--- a/gettext-runtime/intl/localealias.c
+++ b/gettext-runtime/intl/localealias.c
@@ -1,5 +1,5 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index c27be86..81ab213 100644
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/lock.c b/gettext-runtime/intl/lock.c
index 6ea32c5..69d624d 100644
--- a/gettext-runtime/intl/lock.c
+++ b/gettext-runtime/intl/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2008, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/lock.h b/gettext-runtime/intl/lock.h
index 26d53ad..6b173f8 100644
--- a/gettext-runtime/intl/lock.h
+++ b/gettext-runtime/intl/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2008, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/log.c b/gettext-runtime/intl/log.c
index 48e9b6b..d17ab5e 100644
--- a/gettext-runtime/intl/log.c
+++ b/gettext-runtime/intl/log.c
@@ -1,5 +1,5 @@
 /* Log file output.
-   Copyright (C) 2003, 2005, 2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2009, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/ngettext.c b/gettext-runtime/intl/ngettext.c
index 6fdb5e4..908c225 100644
--- a/gettext-runtime/intl/ngettext.c
+++ b/gettext-runtime/intl/ngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of ngettext(3) function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/os2compat.c b/gettext-runtime/intl/os2compat.c
index 2d9e1a6..6d94359 100644
--- a/gettext-runtime/intl/os2compat.c
+++ b/gettext-runtime/intl/os2compat.c
@@ -1,5 +1,5 @@
 /* OS/2 compatibility functions.
-   Copyright (C) 2001-2002, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/os2compat.h b/gettext-runtime/intl/os2compat.h
index 281223b..d92ecbe 100644
--- a/gettext-runtime/intl/os2compat.h
+++ b/gettext-runtime/intl/os2compat.h
@@ -1,6 +1,6 @@
 /* OS/2 compatibility defines.
    This file is intended to be included from config.h
-   Copyright (C) 2001-2002, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/osdep.c b/gettext-runtime/intl/osdep.c
index eda9d28..77443a8 100644
--- a/gettext-runtime/intl/osdep.c
+++ b/gettext-runtime/intl/osdep.c
@@ -1,5 +1,5 @@
 /* OS dependent parts of libintl.
-   Copyright (C) 2001-2002, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/plural-exp.c b/gettext-runtime/intl/plural-exp.c
index d483853..b1445ff 100644
--- a/gettext-runtime/intl/plural-exp.c
+++ b/gettext-runtime/intl/plural-exp.c
@@ -1,5 +1,5 @@
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software: you can redistribute it and/or modify
@@ -25,9 +25,7 @@
 
 #include "plural-exp.h"
 
-#if (defined __GNUC__ && !(defined __APPLE_CC_ && __APPLE_CC__ > 1) \
-     && !defined __cplusplus)                                       \
-    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+#if HAVE_STRUCT_INITIALIZER
 
 /* These structs are the constant expression for the germanic plural
    form determination.  It represents the expression  "n != 1".  */
diff --git a/gettext-runtime/intl/plural-exp.h b/gettext-runtime/intl/plural-exp.h
index 32edbc0..6278b95 100644
--- a/gettext-runtime/intl/plural-exp.h
+++ b/gettext-runtime/intl/plural-exp.h
@@ -1,5 +1,5 @@
 /* Expression parsing and evaluation for plural form selection.
-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software: you can redistribute it and/or modify
@@ -105,10 +105,24 @@ struct parse_args
 # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
 #endif
 
+#if (defined __GNUC__ && !(defined __APPLE_CC_ && __APPLE_CC__ > 1) \
+     && !defined __cplusplus)                                       \
+    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)    \
+    || (defined __SUNPRO_C && 0x560 <= __SUNPRO_C                   \
+        && !(defined __STDC__ && __STDC__ == 1))
+# define HAVE_STRUCT_INITIALIZER 1
+#else
+# define HAVE_STRUCT_INITIALIZER 0
+#endif
+
 extern void FREE_EXPRESSION (struct expression *exp)
      internal_function;
 extern int PLURAL_PARSE (struct parse_args *arg);
+#if HAVE_STRUCT_INITIALIZER
 extern const struct expression GERMANIC_PLURAL attribute_hidden;
+#else
+extern struct expression GERMANIC_PLURAL attribute_hidden;
+#endif
 extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
 				       const struct expression **pluralp,
 				       unsigned long int *npluralsp)
diff --git a/gettext-runtime/intl/plural.c b/gettext-runtime/intl/plural.c
index 86b2583..114245a 100644
--- a/gettext-runtime/intl/plural.c
+++ b/gettext-runtime/intl/plural.c
@@ -71,7 +71,7 @@
 #line 1 "plural.y" /* yacc.c:339  */
 
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/plural.y b/gettext-runtime/intl/plural.y
index 7ff11d9..b9e10ef 100644
--- a/gettext-runtime/intl/plural.y
+++ b/gettext-runtime/intl/plural.y
@@ -1,6 +1,6 @@
 %{
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/printf-args.c b/gettext-runtime/intl/printf-args.c
index 3c34867..6522526 100644
--- a/gettext-runtime/intl/printf-args.c
+++ b/gettext-runtime/intl/printf-args.c
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/printf-args.h b/gettext-runtime/intl/printf-args.h
index 0937e60..946328b 100644
--- a/gettext-runtime/intl/printf-args.h
+++ b/gettext-runtime/intl/printf-args.h
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011, 2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2011, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/printf-parse.c b/gettext-runtime/intl/printf-parse.c
index 87f49a3..ebcb484 100644
--- a/gettext-runtime/intl/printf-parse.c
+++ b/gettext-runtime/intl/printf-parse.c
@@ -1,6 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2008, 2011, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2008, 2011, 2015-2016 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/printf-parse.h b/gettext-runtime/intl/printf-parse.h
index b90233e..547d9d0 100644
--- a/gettext-runtime/intl/printf-parse.h
+++ b/gettext-runtime/intl/printf-parse.h
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015 Free
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015-2016 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/printf.c b/gettext-runtime/intl/printf.c
index 35c0fa0..7e6bebd 100644
--- a/gettext-runtime/intl/printf.c
+++ b/gettext-runtime/intl/printf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings, using POSIX/XSI format strings with positions.
-   Copyright (C) 2003, 2006-2007, 2009-2011, 2015 Free Software
+   Copyright (C) 2003, 2006-2007, 2009-2011, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-runtime/intl/ref-add.sin b/gettext-runtime/intl/ref-add.sin
index 19cf2b0..189b614 100644
--- a/gettext-runtime/intl/ref-add.sin
+++ b/gettext-runtime/intl/ref-add.sin
@@ -1,6 +1,6 @@
 # Add this package to a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2015-2016 Free Software Foundation, Inc.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/ref-del.sin b/gettext-runtime/intl/ref-del.sin
index a29f509..5e36932 100644
--- a/gettext-runtime/intl/ref-del.sin
+++ b/gettext-runtime/intl/ref-del.sin
@@ -1,6 +1,6 @@
 # Remove this package from a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2015-2016 Free Software Foundation, Inc.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/relocatable.c b/gettext-runtime/intl/relocatable.c
index 66532b4..60cb54a 100644
--- a/gettext-runtime/intl/relocatable.c
+++ b/gettext-runtime/intl/relocatable.c
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/relocatable.h b/gettext-runtime/intl/relocatable.h
index 8ee49f3..ecad3a7 100644
--- a/gettext-runtime/intl/relocatable.h
+++ b/gettext-runtime/intl/relocatable.h
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003, 2005, 2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2008, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/setlocale.c b/gettext-runtime/intl/setlocale.c
index 9c4cf11..07c2305 100644
--- a/gettext-runtime/intl/setlocale.c
+++ b/gettext-runtime/intl/setlocale.c
@@ -1,5 +1,5 @@
 /* setlocale() function that respects the locale chosen by the user.
-   Copyright (C) 2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/textdomain.c b/gettext-runtime/intl/textdomain.c
index 7ccf68e..4784b3e 100644
--- a/gettext-runtime/intl/textdomain.c
+++ b/gettext-runtime/intl/textdomain.c
@@ -1,5 +1,5 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/threadlib.c b/gettext-runtime/intl/threadlib.c
index 11363a8..90f0dbe 100644
--- a/gettext-runtime/intl/threadlib.c
+++ b/gettext-runtime/intl/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2009, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/tsearch.c b/gettext-runtime/intl/tsearch.c
index a7c51c2..e3cdcaf 100644
--- a/gettext-runtime/intl/tsearch.c
+++ b/gettext-runtime/intl/tsearch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1997, 2000, 2006, 2015 Free Software Foundation,
+/* Copyright (C) 1995-1997, 2000, 2006, 2015-2016 Free Software Foundation,
    Inc.
    Contributed by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>, 1997.
 
diff --git a/gettext-runtime/intl/tsearch.h b/gettext-runtime/intl/tsearch.h
index 71263cd..243eca6 100644
--- a/gettext-runtime/intl/tsearch.h
+++ b/gettext-runtime/intl/tsearch.h
@@ -1,5 +1,5 @@
 /* Binary tree data structure.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c
index fabdc17..236bfe5 100644
--- a/gettext-runtime/intl/vasnprintf.c
+++ b/gettext-runtime/intl/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/vasnprintf.h b/gettext-runtime/intl/vasnprintf.h
index 2594015..5a2bbfc 100644
--- a/gettext-runtime/intl/vasnprintf.h
+++ b/gettext-runtime/intl/vasnprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2012, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/vasnwprintf.h b/gettext-runtime/intl/vasnwprintf.h
index 584b331..aeb69d2 100644
--- a/gettext-runtime/intl/vasnwprintf.h
+++ b/gettext-runtime/intl/vasnwprintf.h
@@ -1,5 +1,5 @@
 /* vswprintf with automatic memory allocation.
-   Copyright (C) 2002-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/verify.h b/gettext-runtime/intl/verify.h
index 4784fb3..267de29 100644
--- a/gettext-runtime/intl/verify.h
+++ b/gettext-runtime/intl/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/version.c b/gettext-runtime/intl/version.c
index 22f6f77..4070c1f 100644
--- a/gettext-runtime/intl/version.c
+++ b/gettext-runtime/intl/version.c
@@ -1,5 +1,5 @@
 /* libintl library version.
-   Copyright (C) 2005, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/intl/wprintf-parse.h b/gettext-runtime/intl/wprintf-parse.h
index 514145a..73d828c 100644
--- a/gettext-runtime/intl/wprintf-parse.h
+++ b/gettext-runtime/intl/wprintf-parse.h
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015 Free
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015-2016 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/intl/xsize.h b/gettext-runtime/intl/xsize.h
index de3d92e..c82712d 100644
--- a/gettext-runtime/intl/xsize.h
+++ b/gettext-runtime/intl/xsize.h
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008-2016 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 5aa6d30..e69de29 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,11 +0,0 @@
-No more ChangeLog files
-========================
-Do not modify any of the ChangeLog files in gettext.  Starting on
-October 14th, 2015 we put changelog information only in the git commit
-log, and generate a top-level ChangeLog file from logs at "make dist"
-time.
-
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index e5656d7..8d4ad39 100644
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gettext-runtime/libasprintf subdirectory of GNU gettext
-## Copyright (C) 2002-2007, 2009-2010, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 2002-2007, 2009-2010, 2015-2016 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/Makefile.gnulib b/gettext-runtime/libasprintf/Makefile.gnulib
index d3c4f0e..1512284 100644
--- a/gettext-runtime/libasprintf/Makefile.gnulib
+++ b/gettext-runtime/libasprintf/Makefile.gnulib
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gettext-runtime/libasprintf/Makefile.in b/gettext-runtime/libasprintf/Makefile.in
index 16cb0d3..97f57e7 100644
--- a/gettext-runtime/libasprintf/Makefile.in
+++ b/gettext-runtime/libasprintf/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gettext-runtime/libasprintf/alloca.in.h b/gettext-runtime/libasprintf/alloca.in.h
index d277582..41bc32e 100644
--- a/gettext-runtime/libasprintf/alloca.in.h
+++ b/gettext-runtime/libasprintf/alloca.in.h
@@ -1,5 +1,5 @@
 /* Memory allocation on the stack.
-   Copyright (C) 1995, 1999, 2001-2007, 2015 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2007, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/asnprintf.c b/gettext-runtime/libasprintf/asnprintf.c
index 7467315..9cb0776 100644
--- a/gettext-runtime/libasprintf/asnprintf.c
+++ b/gettext-runtime/libasprintf/asnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/asprintf.c b/gettext-runtime/libasprintf/asprintf.c
index 521d586..1a29f6c 100644
--- a/gettext-runtime/libasprintf/asprintf.c
+++ b/gettext-runtime/libasprintf/asprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007, 2015 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/autosprintf.cc b/gettext-runtime/libasprintf/autosprintf.cc
index 25422d8..0c8bff1 100644
--- a/gettext-runtime/libasprintf/autosprintf.cc
+++ b/gettext-runtime/libasprintf/autosprintf.cc
@@ -1,5 +1,5 @@
 /* Class autosprintf - formatted output to an ostream.
-   Copyright (C) 2002, 2013, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2013, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/autosprintf.in.h b/gettext-runtime/libasprintf/autosprintf.in.h
index 22e7443..1c9eb18 100644
--- a/gettext-runtime/libasprintf/autosprintf.in.h
+++ b/gettext-runtime/libasprintf/autosprintf.in.h
@@ -1,5 +1,5 @@
 /* Class autosprintf - formatted output to an ostream.
-   Copyright (C) 2002, 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2012-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/autosprintf.info b/gettext-runtime/libasprintf/autosprintf.info
index 5dd0491..b14bc88 100644
--- a/gettext-runtime/libasprintf/autosprintf.info
+++ b/gettext-runtime/libasprintf/autosprintf.info
@@ -1,7 +1,8 @@
 This is autosprintf.info, produced by makeinfo version 5.2 from
 autosprintf.texi.
 
-Copyright (C) 2002-2003, 2006-2007, 2015 Free Software Foundation, Inc.
+Copyright (C) 2002-2003, 2006-2007, 2015-2016 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
@@ -125,9 +126,9 @@ variable that it provides.
 
 
 Tag Table:
-Node: Top1345
-Node: Introduction1705
-Node: Class autosprintf2858
-Node: Using autosprintf3869
+Node: Top1350
+Node: Introduction1710
+Node: Class autosprintf2863
+Node: Using autosprintf3874
 
 End Tag Table
diff --git a/gettext-runtime/libasprintf/autosprintf.texi b/gettext-runtime/libasprintf/autosprintf.texi
index 56b1998..2e11d0e 100644
--- a/gettext-runtime/libasprintf/autosprintf.texi
+++ b/gettext-runtime/libasprintf/autosprintf.texi
@@ -33,7 +33,7 @@
 This file provides documentation for GNU @code{autosprintf} library.
 
 @copying
-Copyright (C) 2002-2003, 2006-2007, 2015 Free Software Foundation, Inc.
+Copyright (C) 2002-2003, 2006-2007, 2015-2016 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
diff --git a/gettext-runtime/libasprintf/autosprintf_all.html b/gettext-runtime/libasprintf/autosprintf_all.html
index 2274da9..ab810e7 100644
--- a/gettext-runtime/libasprintf/autosprintf_all.html
+++ b/gettext-runtime/libasprintf/autosprintf_all.html
@@ -21,7 +21,7 @@
 <P><HR><P>
 
 <P>
-Copyright (C) 2002-2003, 2006-2007, 2015 Free Software Foundation, Inc.
+Copyright (C) 2002-2003, 2006-2007, 2015-2016 Free Software Foundation, Inc.
 
 </P>
 <P>
diff --git a/gettext-runtime/libasprintf/config.h.in b/gettext-runtime/libasprintf/config.h.in
index 5c6b008..1f11dbc 100644
--- a/gettext-runtime/libasprintf/config.h.in
+++ b/gettext-runtime/libasprintf/config.h.in
@@ -206,6 +206,7 @@
       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
       : (199901L <= __STDC_VERSION__ \
          && !defined __HP_cc \
+         && !defined __PGI \
          && !(defined __SUNPRO_C && __STDC__))) \
      && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
 # define _GL_INLINE inline
diff --git a/gettext-runtime/libasprintf/configure b/gettext-runtime/libasprintf/configure
index 6ffedae..59daf11 100755
--- a/gettext-runtime/libasprintf/configure
+++ b/gettext-runtime/libasprintf/configure
@@ -16856,7 +16856,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 case "$host_os" in
   # On Cygwin, without -no-undefined, a warning is emitted and only a static
   # library is built.
-  beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
+  beos* | mingw* | cygwin* | os2*) LTNOUNDEF='-no-undefined' ;;
   *) LTNOUNDEF='' ;;
 esac
 
diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac
index a7c2811..736bf48 100644
--- a/gettext-runtime/libasprintf/configure.ac
+++ b/gettext-runtime/libasprintf/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the GNU libasprintf library
-dnl Copyright (C) 2002-2011, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2011, 2015-2016 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@ LT_INIT([win32-dll])
 case "$host_os" in
   # On Cygwin, without -no-undefined, a warning is emitted and only a static
   # library is built.
-  beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
+  beos* | mingw* | cygwin* | os2*) LTNOUNDEF='-no-undefined' ;;
   *) LTNOUNDEF='' ;;
 esac
 AC_SUBST([LTNOUNDEF])
diff --git a/gettext-runtime/libasprintf/errno.in.h b/gettext-runtime/libasprintf/errno.in.h
index 4d68ea0..f1fcf1f 100644
--- a/gettext-runtime/libasprintf/errno.in.h
+++ b/gettext-runtime/libasprintf/errno.in.h
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/gnulib-m4/00gnulib.m4 b/gettext-runtime/libasprintf/gnulib-m4/00gnulib.m4
index c7103ed..bb37e32 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/00gnulib.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/libasprintf/gnulib-m4/absolute-header.m4 b/gettext-runtime/libasprintf/gnulib-m4/absolute-header.m4
index bc19dfc..7ffc38d 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/absolute-header.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/absolute-header.m4
@@ -1,5 +1,5 @@
 # absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/libasprintf/gnulib-m4/alloca.m4 b/gettext-runtime/libasprintf/gnulib-m4/alloca.m4
index c7165e5..64f9a79 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/alloca.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011, 2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006, 2011, 2015-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/libasprintf/gnulib-m4/errno_h.m4 b/gettext-runtime/libasprintf/gnulib-m4/errno_h.m4
index cfaa687..b111fce 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/errno_h.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/errno_h.m4
@@ -1,5 +1,5 @@
 # errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4 b/gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4
index c25f630..8528c3a 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gettext-runtime/libasprintf/gnulib-m4/gnulib-common.m4 b/gettext-runtime/libasprintf/gnulib-m4/gnulib-common.m4
index 50ef974..f8454c8 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/gnulib-common.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/gnulib-common.m4
@@ -1,5 +1,5 @@
 # gnulib-common.m4 serial 36
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/libasprintf/gnulib-m4/gnulib-comp.m4 b/gettext-runtime/libasprintf/gnulib-m4/gnulib-comp.m4
index 07b40a0..44ad19a 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/gnulib-comp.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gettext-runtime/libasprintf/gnulib-m4/include_next.m4 b/gettext-runtime/libasprintf/gnulib-m4/include_next.m4
index 233d254..db0f2c0 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/include_next.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 23
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4 b/gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4
index 4bd8155..9559acc 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/intmax_t.m4
@@ -1,5 +1,5 @@
 # intmax_t.m4 serial 8
-dnl Copyright (C) 1997-2004, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 1997-2004, 2006-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/libasprintf/gnulib-m4/onceonly.m4 b/gettext-runtime/libasprintf/gnulib-m4/onceonly.m4
index cb5872c..c0c9e2c 100644
--- a/gettext-runtime/libasprintf/gnulib-m4/onceonly.m4
+++ b/gettext-runtime/libasprintf/gnulib-m4/onceonly.m4
@@ -1,5 +1,5 @@
 # onceonly.m4 serial 9
-dnl Copyright (C) 2002-2003, 2005-2006, 2008-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2008-2016 Free Software Foundation,
 dnl Inc.
 dnl
 dnl This file is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/lib-asprintf.c b/gettext-runtime/libasprintf/lib-asprintf.c
index f8ca5d4..afa04dd 100644
--- a/gettext-runtime/libasprintf/lib-asprintf.c
+++ b/gettext-runtime/libasprintf/lib-asprintf.c
@@ -1,5 +1,5 @@
 /* Library functions for class autosprintf.
-   Copyright (C) 2002-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/lib-asprintf.h b/gettext-runtime/libasprintf/lib-asprintf.h
index 95c2b38..22874f2 100644
--- a/gettext-runtime/libasprintf/lib-asprintf.h
+++ b/gettext-runtime/libasprintf/lib-asprintf.h
@@ -1,5 +1,5 @@
 /* Library functions for class autosprintf.
-   Copyright (C) 2002-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/printf-args.c b/gettext-runtime/libasprintf/printf-args.c
index 3c34867..6522526 100644
--- a/gettext-runtime/libasprintf/printf-args.c
+++ b/gettext-runtime/libasprintf/printf-args.c
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/printf-args.h b/gettext-runtime/libasprintf/printf-args.h
index 0937e60..946328b 100644
--- a/gettext-runtime/libasprintf/printf-args.h
+++ b/gettext-runtime/libasprintf/printf-args.h
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011, 2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2011, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/printf-parse.c b/gettext-runtime/libasprintf/printf-parse.c
index 87f49a3..ebcb484 100644
--- a/gettext-runtime/libasprintf/printf-parse.c
+++ b/gettext-runtime/libasprintf/printf-parse.c
@@ -1,6 +1,6 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2008, 2011, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2008, 2011, 2015-2016 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/printf-parse.h b/gettext-runtime/libasprintf/printf-parse.h
index b90233e..547d9d0 100644
--- a/gettext-runtime/libasprintf/printf-parse.h
+++ b/gettext-runtime/libasprintf/printf-parse.h
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015 Free
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011, 2015-2016 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/size_max.h b/gettext-runtime/libasprintf/size_max.h
index b7a99a5..5e89e69 100644
--- a/gettext-runtime/libasprintf/size_max.h
+++ b/gettext-runtime/libasprintf/size_max.h
@@ -1,5 +1,5 @@
 /* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index fabdc17..236bfe5 100644
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/vasnprintf.h b/gettext-runtime/libasprintf/vasnprintf.h
index 2594015..5a2bbfc 100644
--- a/gettext-runtime/libasprintf/vasnprintf.h
+++ b/gettext-runtime/libasprintf/vasnprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2012, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/vasprintf.c b/gettext-runtime/libasprintf/vasprintf.c
index 5b595af..50932d2 100644
--- a/gettext-runtime/libasprintf/vasprintf.c
+++ b/gettext-runtime/libasprintf/vasprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007, 2015 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/libasprintf/vasprintf.h b/gettext-runtime/libasprintf/vasprintf.h
index 6d7f3c6..7347a93 100644
--- a/gettext-runtime/libasprintf/vasprintf.h
+++ b/gettext-runtime/libasprintf/vasprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2003, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2012, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/verify.h b/gettext-runtime/libasprintf/verify.h
index 4784fb3..267de29 100644
--- a/gettext-runtime/libasprintf/verify.h
+++ b/gettext-runtime/libasprintf/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/libasprintf/xsize.h b/gettext-runtime/libasprintf/xsize.h
index de3d92e..c82712d 100644
--- a/gettext-runtime/libasprintf/xsize.h
+++ b/gettext-runtime/libasprintf/xsize.h
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008-2016 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/m4/Makefile.in b/gettext-runtime/m4/Makefile.in
index 4e91048..2d5daf6 100644
--- a/gettext-runtime/m4/Makefile.in
+++ b/gettext-runtime/m4/Makefile.in
@@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-runtime/m4/codeset.m4 b/gettext-runtime/m4/codeset.m4
index d7de8d6..bc98201 100644
--- a/gettext-runtime/m4/codeset.m4
+++ b/gettext-runtime/m4/codeset.m4
@@ -1,5 +1,6 @@
 # codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/extern-inline.m4 b/gettext-runtime/m4/extern-inline.m4
index 7280065..1e578f3 100644
--- a/gettext-runtime/m4/extern-inline.m4
+++ b/gettext-runtime/m4/extern-inline.m4
@@ -1,6 +1,6 @@
 dnl 'extern inline' a la ISO C99.
 
-dnl Copyright 2012-2015 Free Software Foundation, Inc.
+dnl Copyright 2012-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -54,6 +54,7 @@ AC_DEFUN([gl_EXTERN_INLINE],
       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
       : (199901L <= __STDC_VERSION__ \
          && !defined __HP_cc \
+         && !defined __PGI \
          && !(defined __SUNPRO_C && __STDC__))) \
      && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
 # define _GL_INLINE inline
diff --git a/gettext-runtime/m4/fcntl-o.m4 b/gettext-runtime/m4/fcntl-o.m4
index 891a62f..24fcf88 100644
--- a/gettext-runtime/m4/fcntl-o.m4
+++ b/gettext-runtime/m4/fcntl-o.m4
@@ -1,5 +1,5 @@
 # fcntl-o.m4 serial 4
-dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index da31efe..eef5073 100644
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,5 +1,5 @@
-# gettext.m4 serial 67 (gettext-0.19.6)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# gettext.m4 serial 68 (gettext-0.19.8)
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -161,13 +161,18 @@ changequote([,])dnl
             [AC_LANG_PROGRAM(
                [[
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
                ]],
                [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                ]])],
             [eval "$gt_func_gnugettext_libc=yes"],
             [eval "$gt_func_gnugettext_libc=no"])])
@@ -193,17 +198,22 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b
               [AC_LANG_PROGRAM(
                  [[
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
                  ]],
                  [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                  ]])],
               [eval "$gt_func_gnugettext_libintl=yes"],
               [eval "$gt_func_gnugettext_libintl=no"])
@@ -214,17 +224,22 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
                 [AC_LANG_PROGRAM(
                    [[
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
                    ]],
                    [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                    ]])],
                 [LIBINTL="$LIBINTL $LIBICONV"
                  LTLIBINTL="$LTLIBINTL $LTLIBICONV"
diff --git a/gettext-runtime/m4/glibc2.m4 b/gettext-runtime/m4/glibc2.m4
index 216c863..785bba0 100644
--- a/gettext-runtime/m4/glibc2.m4
+++ b/gettext-runtime/m4/glibc2.m4
@@ -1,5 +1,5 @@
 # glibc2.m4 serial 3
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2015 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/m4/glibc21.m4 b/gettext-runtime/m4/glibc21.m4
index 3a971c5..dafebf5 100644
--- a/gettext-runtime/m4/glibc21.m4
+++ b/gettext-runtime/m4/glibc21.m4
@@ -1,5 +1,5 @@
 # glibc21.m4 serial 5
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2015 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4
index 4e37363..aa159c5 100644
--- a/gettext-runtime/m4/iconv.m4
+++ b/gettext-runtime/m4/iconv.m4
@@ -1,5 +1,5 @@
 # iconv.m4 serial 19 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/intdiv0.m4 b/gettext-runtime/m4/intdiv0.m4
index 44f9863..744b99e 100644
--- a/gettext-runtime/m4/intdiv0.m4
+++ b/gettext-runtime/m4/intdiv0.m4
@@ -1,5 +1,5 @@
 # intdiv0.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002, 2007-2008, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2008, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -38,7 +38,7 @@ static void
 sigfpe_handler (int sig)
 {
   /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
+  _exit (sig != SIGFPE);
 }
 
 int x = 1;
diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 5cd7863..42fac95 100644
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,5 +1,5 @@
 # intl.m4 serial 29 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/intldir.m4 b/gettext-runtime/m4/intldir.m4
index 3ca0d14..c688f46 100644
--- a/gettext-runtime/m4/intldir.m4
+++ b/gettext-runtime/m4/intldir.m4
@@ -1,5 +1,5 @@
 # intldir.m4 serial 2 (gettext-0.18)
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/intlmacosx.m4 b/gettext-runtime/m4/intlmacosx.m4
index bba7b3d..aca924c 100644
--- a/gettext-runtime/m4/intlmacosx.m4
+++ b/gettext-runtime/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/intmax.m4 b/gettext-runtime/m4/intmax.m4
index 08b3a38..1a47107 100644
--- a/gettext-runtime/m4/intmax.m4
+++ b/gettext-runtime/m4/intmax.m4
@@ -1,5 +1,5 @@
 # intmax.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002-2005, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/inttypes-pri.m4 b/gettext-runtime/m4/inttypes-pri.m4
index 0884e71..ae20183 100644
--- a/gettext-runtime/m4/inttypes-pri.m4
+++ b/gettext-runtime/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
 # inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2002, 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/inttypes_h.m4 b/gettext-runtime/m4/inttypes_h.m4
index d0b5f5d..7657119 100644
--- a/gettext-runtime/m4/inttypes_h.m4
+++ b/gettext-runtime/m4/inttypes_h.m4
@@ -1,5 +1,5 @@
 # inttypes_h.m4 serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/lcmessage.m4 b/gettext-runtime/m4/lcmessage.m4
index 1e40e44..1c24d6d 100644
--- a/gettext-runtime/m4/lcmessage.m4
+++ b/gettext-runtime/m4/lcmessage.m4
@@ -1,6 +1,6 @@
 # lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/lock.m4 b/gettext-runtime/m4/lock.m4
index 9fd4aa7..1e83e23 100644
--- a/gettext-runtime/m4/lock.m4
+++ b/gettext-runtime/m4/lock.m4
@@ -1,5 +1,5 @@
 # lock.m4 serial 13 (gettext-0.18.2)
-dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/longlong.m4 b/gettext-runtime/m4/longlong.m4
index d57bc70..36d8b12 100644
--- a/gettext-runtime/m4/longlong.m4
+++ b/gettext-runtime/m4/longlong.m4
@@ -1,5 +1,5 @@
 # longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/nls.m4 b/gettext-runtime/m4/nls.m4
index 93df8d3..afdb9ca 100644
--- a/gettext-runtime/m4/nls.m4
+++ b/gettext-runtime/m4/nls.m4
@@ -1,6 +1,6 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index d4bc262..c5a2f6b 100644
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,5 +1,5 @@
 # po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/printf-posix.m4 b/gettext-runtime/m4/printf-posix.m4
index 0f85ad6..f9088c0 100644
--- a/gettext-runtime/m4/printf-posix.m4
+++ b/gettext-runtime/m4/printf-posix.m4
@@ -1,5 +1,5 @@
 # printf-posix.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/progtest.m4 b/gettext-runtime/m4/progtest.m4
index 0921e1e..9ace7c3 100644
--- a/gettext-runtime/m4/progtest.m4
+++ b/gettext-runtime/m4/progtest.m4
@@ -1,5 +1,5 @@
 # progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/size_max.m4 b/gettext-runtime/m4/size_max.m4
index 186e3fd..de69025 100644
--- a/gettext-runtime/m4/size_max.m4
+++ b/gettext-runtime/m4/size_max.m4
@@ -1,5 +1,5 @@
 # size_max.m4 serial 10
-dnl Copyright (C) 2003, 2005-2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/stdint_h.m4 b/gettext-runtime/m4/stdint_h.m4
index 5097c0b..f823b94 100644
--- a/gettext-runtime/m4/stdint_h.m4
+++ b/gettext-runtime/m4/stdint_h.m4
@@ -1,5 +1,5 @@
 # stdint_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/threadlib.m4 b/gettext-runtime/m4/threadlib.m4
index 8615ac9..b43534e 100644
--- a/gettext-runtime/m4/threadlib.m4
+++ b/gettext-runtime/m4/threadlib.m4
@@ -1,5 +1,5 @@
 # threadlib.m4 serial 11 (gettext-0.18.2)
-dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/uintmax_t.m4 b/gettext-runtime/m4/uintmax_t.m4
index 8a92f58..30f4dd5 100644
--- a/gettext-runtime/m4/uintmax_t.m4
+++ b/gettext-runtime/m4/uintmax_t.m4
@@ -1,5 +1,5 @@
 # uintmax_t.m4 serial 12
-dnl Copyright (C) 1997-2004, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/visibility.m4 b/gettext-runtime/m4/visibility.m4
index 6fff745..e99e3fb 100644
--- a/gettext-runtime/m4/visibility.m4
+++ b/gettext-runtime/m4/visibility.m4
@@ -1,5 +1,5 @@
 # visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/wchar_t.m4 b/gettext-runtime/m4/wchar_t.m4
index dc964e6..2db8c3f 100644
--- a/gettext-runtime/m4/wchar_t.m4
+++ b/gettext-runtime/m4/wchar_t.m4
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/wint_t.m4 b/gettext-runtime/m4/wint_t.m4
index ca3fd44..8ff2a5b 100644
--- a/gettext-runtime/m4/wint_t.m4
+++ b/gettext-runtime/m4/wint_t.m4
@@ -1,5 +1,5 @@
 # wint_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/m4/xsize.m4 b/gettext-runtime/m4/xsize.m4
index 98faf7d..16764e8 100644
--- a/gettext-runtime/m4/xsize.m4
+++ b/gettext-runtime/m4/xsize.m4
@@ -1,5 +1,5 @@
 # xsize.m4 serial 5
-dnl Copyright (C) 2003-2004, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am
index b4e9259..f575194 100644
--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/man subdirectory of GNU gettext
-## Copyright (C) 2001-2003, 2006, 2009, 2015 Free Software Foundation,
+## Copyright (C) 2001-2003, 2006, 2009, 2015-2016 Free Software Foundation,
 ## Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/man/Makefile.in b/gettext-runtime/man/Makefile.in
index bd26106..f8e8a82 100644
--- a/gettext-runtime/man/Makefile.in
+++ b/gettext-runtime/man/Makefile.in
@@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-runtime/man/bind_textdomain_codeset.3 b/gettext-runtime/man/bind_textdomain_codeset.3
index 90c961c..5473996 100644
--- a/gettext-runtime/man/bind_textdomain_codeset.3
+++ b/gettext-runtime/man/bind_textdomain_codeset.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.19.7"
+.TH BIND_TEXTDOMAIN_CODESET 3 "May 2001" "GNU gettext 0.19.8.1"
 .SH NAME
 bind_textdomain_codeset \- set encoding of message translations
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/bindtextdomain.3 b/gettext-runtime/man/bindtextdomain.3
index c23529b..e47b229 100644
--- a/gettext-runtime/man/bindtextdomain.3
+++ b/gettext-runtime/man/bindtextdomain.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.19.7"
+.TH BINDTEXTDOMAIN 3 "May 2001" "GNU gettext 0.19.8.1"
 .SH NAME
 bindtextdomain \- set directory containing message catalogs
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/envsubst.1 b/gettext-runtime/man/envsubst.1
index 07b4716..37f4a62 100644
--- a/gettext-runtime/man/envsubst.1
+++ b/gettext-runtime/man/envsubst.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH ENVSUBST "1" "December 2015" "GNU gettext-runtime 0.19.7" GNU
+.TH ENVSUBST "1" "June 2016" "GNU gettext-runtime 0.19.8.1" GNU
 .SH NAME
 envsubst \- substitutes environment variables in shell format strings
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/gettext.1.in b/gettext-runtime/man/gettext.1.in
index 169d835..3960be1 100644
--- a/gettext-runtime/man/gettext.1.in
+++ b/gettext-runtime/man/gettext.1.in
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH GETTEXT "1" "December 2015" "GNU gettext-runtime 0.19.7" GNU
+.TH GETTEXT "1" "June 2016" "GNU gettext-runtime 0.19.8.1" GNU
 .SH NAME
 gettext \- translate message
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/gettext.3 b/gettext-runtime/man/gettext.3
index 59346ae..3b0e651 100644
--- a/gettext-runtime/man/gettext.3
+++ b/gettext-runtime/man/gettext.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH GETTEXT 3 "May 2001" "GNU gettext 0.19.7"
+.TH GETTEXT 3 "May 2001" "GNU gettext 0.19.8.1"
 .SH NAME
 gettext, dgettext, dcgettext \- translate message
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/help2man b/gettext-runtime/man/help2man
index 1b6ad65..296778d 100755
--- a/gettext-runtime/man/help2man
+++ b/gettext-runtime/man/help2man
@@ -31,7 +31,7 @@ my $this_version = '1.24';
 my $version_info = <<EOT;
 GNU $this_program $this_version
 
-Copyright (C) 1997-2000, 2015 Free Software Foundation, Inc.
+Copyright (C) 1997-2000, 2015-2016 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
diff --git a/gettext-runtime/man/ngettext.1.in b/gettext-runtime/man/ngettext.1.in
index e1bc24b..a2dcadc 100644
--- a/gettext-runtime/man/ngettext.1.in
+++ b/gettext-runtime/man/ngettext.1.in
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH NGETTEXT "1" "December 2015" "GNU gettext-runtime 0.19.7" GNU
+.TH NGETTEXT "1" "June 2016" "GNU gettext-runtime 0.19.8.1" GNU
 .SH NAME
 ngettext \- translate message and choose plural form
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/ngettext.3 b/gettext-runtime/man/ngettext.3
index 1636f43..15f6f42 100644
--- a/gettext-runtime/man/ngettext.3
+++ b/gettext-runtime/man/ngettext.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH NGETTEXT 3 "May 2001" "GNU gettext 0.19.7"
+.TH NGETTEXT 3 "May 2001" "GNU gettext 0.19.8.1"
 .SH NAME
 ngettext, dngettext, dcngettext \- translate message and choose plural form
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/textdomain.3 b/gettext-runtime/man/textdomain.3
index 89e915b..23d0036 100644
--- a/gettext-runtime/man/textdomain.3
+++ b/gettext-runtime/man/textdomain.3
@@ -10,7 +10,7 @@
 .\"   GNU gettext source code and manual
 .\"   LI18NUX 2000 Globalization Specification
 .\"
-.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.19.7"
+.TH TEXTDOMAIN 3 "May 2001" "GNU gettext 0.19.8.1"
 .SH NAME
 textdomain \- set domain for future gettext() calls
 .SH SYNOPSIS
diff --git a/gettext-runtime/man/x-to-1.in b/gettext-runtime/man/x-to-1.in
index 0169c71..c65b47e 100644
--- a/gettext-runtime/man/x-to-1.in
+++ b/gettext-runtime/man/x-to-1.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2001, 2003, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2015-2016 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
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 1790245..ecbbc7e 100644
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,32 @@
+2016-06-09  Daiki Ueno  <ueno@gnu.org>
+
+	Update translations
+	* gettext-runtime/po/eo.po: Update from Felipe Castro <fefcas@gmail.com>
+	* gettext-runtime/po/hr.po: Update from Božidar Putanec <bozidarp@yahoo.com>
+	* gettext-runtime/po/sv.po: Update from Göran Uddeborg <goeran@uddeborg.se>
+	* gettext-tools/examples/po/eo.po: Update from Felipe Castro <fefcas@gmail.com>
+	* gettext-tools/examples/po/hr.po: Update from Božidar Putanec <bozidarp@yahoo.com>
+	* gettext-tools/examples/po/sv.po: Update from Göran Uddeborg <goeran@uddeborg.se>
+	* gettext-tools/po/bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>
+	* gettext-tools/po/es.po: Update from Antonio Ceballos <aceballos@gmail.com>
+	* gettext-tools/po/fr.po: Update from Stéphane Aulery <lkppo@free.fr>
+	* gettext-tools/po/ja.po: Update from Masahito Yamaga <ma@yama-ga.com>
+	* gettext-tools/po/ko.po: Update from Changwoo Ryu <cwryu@debian.org>
+	* gettext-tools/po/nl.po: Update from Benno Schulenberg <benno@vertaalt.nl>
+	* gettext-tools/po/pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>
+	* gettext-tools/po/sk.po: Update from Marcel Telka <marcel@telka.sk>
+	* gettext-tools/po/sr.po: Update from Миро�лав �иколић <miroslavnikolic@rocketmail.com>
+	* gettext-tools/po/sv.po: Update from Göran Uddeborg <goeran@uddeborg.se>
+	* gettext-tools/po/tr.po: Update from Nilgün Belma Bugüner <nilgun@buguner.name.tr>
+	* gettext-tools/po/uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>
+	* gettext-tools/po/vi.po: Update from Trần Ng�c Quân <vnwildman@gmail.com>
+
+	Prepare for 0.19.8
+
+2016-01-02  Daiki Ueno  <ueno@gnu.org>
+
+	maint: Update copyright year
+
 2015-12-28  Daiki Ueno  <ueno@gnu.org>
 
 	Update translations
diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index 8f34f00..38c293d 100644
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -6,7 +6,7 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 #
-# Origin: gettext-0.19.7
+# Origin: gettext-0.19.8
 GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
diff --git a/gettext-runtime/po/POTFILES.in b/gettext-runtime/po/POTFILES.in
index cbff73f..67e55ac 100644
--- a/gettext-runtime/po/POTFILES.in
+++ b/gettext-runtime/po/POTFILES.in
@@ -1,5 +1,6 @@
 # List of files which contain translatable strings.
-# Copyright (C) 1995, 1998, 2001-2003, 2005-2006 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1998, 2001-2003, 2005-2006, 2016 Free Software
+# Foundation, Inc.
 
 # For updating this file, look at the result of:
 #   $ LC_ALL=C grep -l '[^A-Za-z_]_(' {gnulib-lib,src}/*.[chly]
diff --git a/gettext-runtime/po/be.gmo b/gettext-runtime/po/be.gmo
index 0f9876a..1913702 100644
--- a/gettext-runtime/po/be.gmo
+++ b/gettext-runtime/po/be.gmo
diff --git a/gettext-runtime/po/be.po b/gettext-runtime/po/be.po
index 3fa7d6c..b984c34 100644
--- a/gettext-runtime/po/be.po
+++ b/gettext-runtime/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2002-09-04 18:51+0300\n"
 "Last-Translator: Ales Nyakhaychyk <i18n@infonet.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
@@ -33,7 +33,7 @@ msgstr "%s: выбар `%s' неадназначны\n"
 #: gnulib-lib/getopt.c:619
 #, fuzzy, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: выбар `-W %s' неадназначны\n"
+msgstr "%s: выбар `%s' неадназначны\n"
 
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
 #, fuzzy, c-format
@@ -91,7 +91,7 @@ msgstr "%s: выбар `%s' патрабуе аргум�нт\n"
 msgid "memory exhausted"
 msgstr "пам�ць вычарпана"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -100,7 +100,7 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�ўтар %s.\n"
@@ -110,17 +110,17 @@ msgstr "�ўтар %s.\n"
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "вельмі шмат аргум�нтаў"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "прапушчаны аргум�нты"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Па�прабуйце \"%s --help\" дл� больш падраб�зных зьве�так.\n"
@@ -185,7 +185,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Паведамл�йце аб памылках на адра� <bug-gnu-gettext@gnu.org>.\n"
 
@@ -199,7 +199,7 @@ msgid "standard input"
 msgstr "�тандартны ўвод"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -259,12 +259,12 @@ msgstr ""
 "заме�т і�нуючых паведамленьн�ў знаходзіць у азначаным каталёгу перакладзены�.\n"
 "Стандартна� дыр�кторы� дл� пошуку: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Выкары�таньне %s [ВЫБ�Р] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -273,7 +273,7 @@ msgstr ""
 "�длю�троўвае пераклады т�к�тавых паведамленьн�ў на родную мову, чы�\n"
 "граматычна� хорма патрабуе ліку (множнага ці адзіночнага).\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -286,7 +286,7 @@ msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/bg.gmo b/gettext-runtime/po/bg.gmo
index a75e3f6..09a41a0 100644
--- a/gettext-runtime/po/bg.gmo
+++ b/gettext-runtime/po/bg.gmo
diff --git a/gettext-runtime/po/bg.po b/gettext-runtime/po/bg.po
index 2f4a01e..78d732d 100644
--- a/gettext-runtime/po/bg.po
+++ b/gettext-runtime/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-23 22:12+0300\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
@@ -90,7 +90,7 @@ msgstr "%s: опци�та '-W %s' изи�ква аргумент\n"
 msgid "memory exhausted"
 msgstr "паметта е изчерпана"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -103,7 +103,7 @@ msgstr ""
 "Това е �вободен програмен продукт: �вободни �те да го промен�те и разпро�тран�-\n"
 "вате.  �е �е дават �ИК�КВИ Г�Р��ЦИИ до �тепента позволена от закона.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Създадена от %s.\n"
@@ -113,17 +113,17 @@ msgstr "Създадена от %s.\n"
 msgid "Bruno Haible"
 msgstr "Бруно Хаибле"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "твърде много аргументи"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "лип�ващи аргументи"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "За повече �ведени�, опитайте '%s --help'.\n"
@@ -193,7 +193,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Подавайте доклади за грешки на <bug-gnu-gettext@gnu.org>,\n"
@@ -209,7 +209,7 @@ msgid "standard input"
 msgstr "�тандартен вход"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
@@ -269,19 +269,19 @@ msgstr ""
 "�ъобщени�та, намерените в избрани� каталог, �е превеждат.\n"
 "Директори� за тър�ене: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ОБЛ�СТТЕКСТ] КЛЮЧ КЛЮЧ-М�.Ч. БРОЙ\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Извежда превода на тек�тово �ъобщение, чи�то граматична форма зави�и от бро�.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -302,7 +302,7 @@ msgstr ""
 "  КЛЮЧ КЛЮЧ-М�.Ч.           превежда КЛЮЧ (ед.ч.) / КЛЮЧ-М�.Ч (мн.ч.)\n"
 "  БРОЙ                      на базата на тази �тойно�т избира формата за ед/мн.ч.\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/ca.gmo b/gettext-runtime/po/ca.gmo
index fdf07e1..34451d9 100644
--- a/gettext-runtime/po/ca.gmo
+++ b/gettext-runtime/po/ca.gmo
diff --git a/gettext-runtime/po/ca.po b/gettext-runtime/po/ca.po
index c4dfb04..a2bb69c 100644
--- a/gettext-runtime/po/ca.po
+++ b/gettext-runtime/po/ca.po
@@ -52,7 +52,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-24 18:49+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -137,7 +137,7 @@ msgstr "%s: l’opció «-W %s» necessita un argument\n"
 msgid "memory exhausted"
 msgstr "la memòria s’ha exhaurit"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -150,7 +150,7 @@ msgstr ""
 "Aquest és programari lliure: podeu modificar�lo i redistribuir�lo si voleu.\n"
 "No hi ha CAP GARANTIA, en la mesura que ho permeta la llei.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
@@ -160,17 +160,17 @@ msgstr "Escrit per %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "sobren arguments"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "manquen arguments"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Proveu «%s --help» per a obtenir més informació.\n"
@@ -242,7 +242,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -256,7 +256,7 @@ msgid "standard input"
 msgstr "entrada estàndard"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -319,12 +319,12 @@ msgstr ""
 "missatges que troba al catàleg seleccionat.\n"
 "Directori estàndard de cerca: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [DOMINI_TEXTUAL] IDMSG IDMSG_PLURAL NOMBRE\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -333,7 +333,7 @@ msgstr ""
 "Mostra la traducció a idioma natiu d’un missatge textual la forma gramatical\n"
 "del qual depén del nombre.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -356,7 +356,7 @@ msgstr ""
 "  NOMBRE               Escull la forma singular o la plural basant�se en\n"
 "                       aquest valor.\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/cs.gmo b/gettext-runtime/po/cs.gmo
index c80b7a4..c08fe9a 100644
--- a/gettext-runtime/po/cs.gmo
+++ b/gettext-runtime/po/cs.gmo
diff --git a/gettext-runtime/po/cs.po b/gettext-runtime/po/cs.po
index f0bf244..3e2ceed 100644
--- a/gettext-runtime/po/cs.po
+++ b/gettext-runtime/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-26 08:34+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -108,7 +108,7 @@ msgstr "%s: přepína� „-W %s“ vyžaduje argument\n"
 msgid "memory exhausted"
 msgstr "paměť vy�erpána"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -123,7 +123,7 @@ msgstr ""
 
 # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
 # src/msgunfmt.c:180 src/xgettext.c:399
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napsal %s.\n"
@@ -134,20 +134,20 @@ msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
 # src/gettextp.c:164
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "příliš mnoho argumentů"
 
 # src/gettextp.c:154
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "chybí argumenty"
 
 # src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298
 # src/msgunfmt.c:210 src/xgettext.c:532
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Více informací získáte příkazem „%s --help“.\n"
@@ -220,7 +220,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Chyby hlaste na <bug-gnu-gettext@gnu.org>.\n"
 
@@ -236,7 +236,7 @@ msgid "standard input"
 msgstr "standardní vstup"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -298,12 +298,12 @@ msgstr ""
 "zprávy nalezené ve vybraném katalogu napřed přeloží. \n"
 "Standardní prohledávaná složka: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Použití: %s [PŘEP�NAČE] [TEXTOV�_DOMÉNA] ID_ZPR�VY ID_PLUR�LU_ZPR�VY POČET\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -311,7 +311,7 @@ msgid ""
 msgstr "Zobrazí v národním jazyce překlad textové zprávy, která gramaticky závisí na po�tu.\n"
 
 # src/gettextp.c:233
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -335,7 +335,7 @@ msgstr ""
 "  POČET                         zvolit jednotné/množné �íslo podle této hodnoty\n"
 
 # src/gettextp.c:245
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/da.gmo b/gettext-runtime/po/da.gmo
index 882a55a..6a9343d 100644
--- a/gettext-runtime/po/da.gmo
+++ b/gettext-runtime/po/da.gmo
diff --git a/gettext-runtime/po/da.po b/gettext-runtime/po/da.po
index a6f0f73..2b303f0 100644
--- a/gettext-runtime/po/da.po
+++ b/gettext-runtime/po/da.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-04-26 01:45+0200\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -96,7 +96,7 @@ msgstr "%s: tilvalget `%s' kræver et argument\n"
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -109,7 +109,7 @@ msgstr ""
 "Dette er frit programmel: du kan frit ændre og videredistribuere det.\n"
 "Der er INGEN GARANTIER, så vidt som lov foreskriver.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
@@ -119,17 +119,17 @@ msgstr "Skrevet af %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argumenter"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "argumenter mangler"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv '%s --help' for yderligere oplysninger.\n"
@@ -199,7 +199,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapportér fejl på engelsk til <bug-gnu-gettext@gnu.org>.\n"
 
@@ -213,7 +213,7 @@ msgid "standard input"
 msgstr "standard-inddata"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -272,12 +272,12 @@ msgstr ""
 "oversættes de tekster der findes i det valgte tekstkatalog.\n"
 "Standard-filkataloget for søgning er: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Brug: %s [TILVALG] [TEKSTDOMÆNE] TEKSTID TEKSTID-FLERTAL ANTAL\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -286,7 +286,7 @@ msgstr ""
 "Vis oversættelser i det lokale sprog af tekstbeskeder hvis grammatiske\n"
 "form beror på et tal.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -307,7 +307,7 @@ msgstr ""
 "  TEKSTID TEKSTID-FLERTAL   oversæt TEKSTID (ental) / TEKSTID-FLERTAL (flertal)\n"
 "  COUNT                     vælg ental/flertalsform ud fra denne værdi\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/de.gmo b/gettext-runtime/po/de.gmo
index 97b3055..44a0be8 100644
--- a/gettext-runtime/po/de.gmo
+++ b/gettext-runtime/po/de.gmo
diff --git a/gettext-runtime/po/de.po b/gettext-runtime/po/de.po
index b09d101..22ed428 100644
--- a/gettext-runtime/po/de.po
+++ b/gettext-runtime/po/de.po
@@ -79,7 +79,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-25 12:17+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -163,7 +163,7 @@ msgstr "%s: Option »-W %s« erwartet ein Argument\n"
 msgid "memory exhausted"
 msgstr "virtueller Speicher aufgebraucht"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -178,7 +178,7 @@ msgstr ""
 "weiterzugeben.\n"
 "Es gibt KEINE GARANTIE, soweit als vom Gesetz erlaubt.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
@@ -188,17 +188,17 @@ msgstr "Geschrieben von %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "Argumente fehlen"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
@@ -269,7 +269,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Fehler bitte auf Englisch an <bug-gnu-gettext@gnu.org> melden.\n"
@@ -287,7 +287,7 @@ msgid "standard input"
 msgstr "Standardeingabe"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -350,13 +350,13 @@ msgstr ""
 "\n"
 "Standardverzeichnis: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Aufruf: %s [OPTION] [TEXTBEREICH] SCHLÃœSSEL SCHLÃœSSEL-PLURAL ZAHL\n"
 
 # CHECKIT
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -365,7 +365,7 @@ msgstr ""
 "Ãœbersetzung einer textuellen Meldung, deren grammatische Form von einer Zahl\n"
 "abhängt, in einer nativen Sprache anzeigen.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -388,7 +388,7 @@ msgstr ""
 "  ZAHL                         Singular-/Pluralform anhand des Wertes ZAHL\n"
 "                                 wählen\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/el.gmo b/gettext-runtime/po/el.gmo
index 92562ac..bf16a8d 100644
--- a/gettext-runtime/po/el.gmo
+++ b/gettext-runtime/po/el.gmo
diff --git a/gettext-runtime/po/el.po b/gettext-runtime/po/el.po
index 26b02ac..1a80ab1 100644
--- a/gettext-runtime/po/el.po
+++ b/gettext-runtime/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
@@ -35,7 +35,7 @@ msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n"
 #: gnulib-lib/getopt.c:619
 #, fuzzy, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé äéöïñïýìåíç\n"
+msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n"
 
 #
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
@@ -104,7 +104,7 @@ msgstr "%s: ç åðéëïãÞ `%s' áðáéôåß ðáñÜìåôñï\n"
 msgid "memory exhausted"
 msgstr "H ìíÞìç åîáíôëÞèçêå"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -114,7 +114,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n"
@@ -125,19 +125,19 @@ msgid "Bruno Haible"
 msgstr ""
 
 #
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "ðÜñá ðïëëÜ ïñßóìáôá"
 
 #
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "õðïëåßðïíôáé ïñßóìáôá"
 
 #
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
@@ -200,7 +200,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
@@ -217,7 +217,7 @@ msgid "standard input"
 msgstr "êáíïíéêÞ åßóïäïò"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -279,12 +279,12 @@ msgstr ""
 "Áíôßèåôá, ôá ìçíýìáôá ðïõ âñßóêïíôáé óôï åðéëåãìÝíï êáôÜëïãï, ìåôáöñÜæïíôáé.\n"
 "ÊáèéåñùìÝíïò êáôÜëïãïò áíáæÞôçóçò: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr ""
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -292,7 +292,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, fuzzy, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -316,7 +316,7 @@ msgstr ""
 "                            óôï MSGID áðü ôï TEXTDOMAIN\n"
 
 #
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, fuzzy, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/en@boldquot.gmo b/gettext-runtime/po/en@boldquot.gmo
index c4a7598..8ec074f 100644
--- a/gettext-runtime/po/en@boldquot.gmo
+++ b/gettext-runtime/po/en@boldquot.gmo
diff --git a/gettext-runtime/po/en@boldquot.po b/gettext-runtime/po/en@boldquot.po
index 2387f9d..26b3992 100644
--- a/gettext-runtime/po/en@boldquot.po
+++ b/gettext-runtime/po/en@boldquot.po
@@ -1,7 +1,7 @@
 # English translations for GNU gettext-runtime package.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gettext-runtime package.
-# Automatically generated, 2015.
+# Automatically generated, 2016.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.19.7\n"
+"Project-Id-Version: GNU gettext-runtime 0.19.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-11 22:08+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@boldquot\n"
@@ -116,7 +116,7 @@ msgstr "%s: option ‘-W %s’ requires an argument\n"
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -129,7 +129,7 @@ msgstr ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
@@ -139,17 +139,17 @@ msgstr "Written by %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "too many arguments"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "missing arguments"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
@@ -219,7 +219,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 
@@ -233,7 +233,7 @@ msgid "standard input"
 msgstr "standard input"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -293,12 +293,12 @@ msgstr ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -307,7 +307,7 @@ msgstr ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -328,7 +328,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/en@quot.gmo b/gettext-runtime/po/en@quot.gmo
index 71fabcd..848915f 100644
--- a/gettext-runtime/po/en@quot.gmo
+++ b/gettext-runtime/po/en@quot.gmo
diff --git a/gettext-runtime/po/en@quot.po b/gettext-runtime/po/en@quot.po
index 862a2fe..7cfc03d 100644
--- a/gettext-runtime/po/en@quot.po
+++ b/gettext-runtime/po/en@quot.po
@@ -1,7 +1,7 @@
 # English translations for GNU gettext-runtime package.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the GNU gettext-runtime package.
-# Automatically generated, 2015.
+# Automatically generated, 2016.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.19.7\n"
+"Project-Id-Version: GNU gettext-runtime 0.19.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-11 22:08+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@quot\n"
@@ -113,7 +113,7 @@ msgstr "%s: option ‘-W %s’ requires an argument\n"
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -126,7 +126,7 @@ msgstr ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
@@ -136,17 +136,17 @@ msgstr "Written by %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "too many arguments"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "missing arguments"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
@@ -216,7 +216,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 
@@ -230,7 +230,7 @@ msgid "standard input"
 msgstr "standard input"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -290,12 +290,12 @@ msgstr ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -304,7 +304,7 @@ msgstr ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -325,7 +325,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/eo.gmo b/gettext-runtime/po/eo.gmo
index 894ed55..8c4d232 100644
--- a/gettext-runtime/po/eo.gmo
+++ b/gettext-runtime/po/eo.gmo
diff --git a/gettext-runtime/po/eo.po b/gettext-runtime/po/eo.po
index 9fcac52..0a49597 100644
--- a/gettext-runtime/po/eo.po
+++ b/gettext-runtime/po/eo.po
@@ -1,16 +1,16 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006, 2007, 2013 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2013, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # D. Dale Gulledge <dsplat@rochester.rr.com> 2006.
 # Edmund GRIMLEY EVANS <edmundo@rano.org> 2006, 2007.
-# Felipe Castro <fefcas@gmail.com>, 2013.
+# Felipe Castro <fefcas@gmail.com>, 2013, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2013-10-30 16:17-0300\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-02-22 18:47-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -33,9 +33,9 @@ msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: la modifilo '%s' estas plursenca; ebloj:"
 
 #: gnulib-lib/getopt.c:619
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: la modifilo '-W %s' estas plursenca\n"
+msgstr "%s: la modifilo '%s' estas plursenca\n"
 
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
 #, c-format
@@ -93,7 +93,7 @@ msgstr "%s: la modifilo '-W %s' bezonas argumenton\n"
 msgid "memory exhausted"
 msgstr "memoro elĉerpita"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -106,7 +106,7 @@ msgstr ""
 "Ĉi tio estas libera programo; vi estas libera �an�i kaj redistribui �in.\n"
 "Estas NENIA GARANTIO, �is la grado le�e permesata.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Verkita de %s.\n"
@@ -116,17 +116,17 @@ msgstr "Verkita de %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "tro da argumentoj"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "argumentoj mankas"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Provu '%s --help' por pli da informoj.\n"
@@ -197,7 +197,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raportu cimojn al <bug-gnu-gettext@gnu.org>.\n"
 
@@ -211,7 +211,7 @@ msgid "standard input"
 msgstr "normala enigo"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -270,12 +270,12 @@ msgstr ""
 "anstataŭe, tiuj mesa�oj trovitaj en la elektita katalogo estas tradukataj.\n"
 "Normala serĉdosierujo: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uzado: %s [MODIFILO] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -284,7 +284,7 @@ msgstr ""
 "Montri lokalingvan tradukon de teksta mesa�o, kies gramatika formo\n"
 "dependas de nombro.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -305,7 +305,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        traduki MSGID (singulare) / MSGID-PLURAL (plurale)\n"
 "  COUNT                     elekti singularon/pluralon per ĉi tiu valoro\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/es.gmo b/gettext-runtime/po/es.gmo
index 12301bc..4892302 100644
--- a/gettext-runtime/po/es.gmo
+++ b/gettext-runtime/po/es.gmo
diff --git a/gettext-runtime/po/es.po b/gettext-runtime/po/es.po
index 602686f..b74f533 100644
--- a/gettext-runtime/po/es.po
+++ b/gettext-runtime/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-23 22:53+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -94,7 +94,7 @@ msgstr "%s: la opción '-W %s' requiere un argumento\n"
 msgid "memory exhausted"
 msgstr "memoria agotada"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -107,7 +107,7 @@ msgstr ""
 "Esto es software libre: puede modificarlo y redistribuirlo libremente.\n"
 "SIN NINGÚN TIPO DE GARANT�A, dentro de los límites legales.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -117,17 +117,17 @@ msgstr "Escrito por %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "faltan argumentos"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pruebe '%s --help' para más información.\n"
@@ -202,7 +202,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunicar defectos a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -216,7 +216,7 @@ msgid "standard input"
 msgstr "entrada estándar"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -293,12 +293,12 @@ msgstr ""
 "encuentre dentro del catálogo seleccionado.\n"
 "Directorio de búsqueda estándar: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [DOMINIODETEXTO] MSGID MSG-PLURAL CUENTA\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -320,7 +320,7 @@ msgstr ""
 # Prefiero que se quede como está, pues aunque se repite muestra,
 # es en otra opción en donde aparece. mm
 #
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -345,7 +345,7 @@ msgstr ""
 
 # Nota: TEXTDOMAIN y TEXTDOMAINDIR son variables de entorno, por lo tanto
 # no se pueden traducir (cuando se refieren a las variables, claro está).
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/et.gmo b/gettext-runtime/po/et.gmo
index f56b670..013e845 100644
--- a/gettext-runtime/po/et.gmo
+++ b/gettext-runtime/po/et.gmo
diff --git a/gettext-runtime/po/et.po b/gettext-runtime/po/et.po
index 04c5e67..1432081 100644
--- a/gettext-runtime/po/et.po
+++ b/gettext-runtime/po/et.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2001-04-30 16:25+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -89,7 +89,7 @@ msgstr "%s: võtme `%s' järel peab olema argument\n"
 msgid "memory exhausted"
 msgstr "mälu sai otsa"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -98,7 +98,7 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Selle programmi on kirjutanud %s.\n"
@@ -108,17 +108,17 @@ msgstr "Selle programmi on kirjutanud %s.\n"
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "argumendid on puudu"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Täiendava info saamiseks proovi `%s --help'.\n"
@@ -180,7 +180,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
@@ -195,7 +195,7 @@ msgid "standard input"
 msgstr "standardsisend"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -259,19 +259,19 @@ msgstr ""
 "found in the selected catalog are translated.!!!\n"
 "Standardne otsinukataloog: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr ""
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, fuzzy, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -297,7 +297,7 @@ msgstr ""
 "  STRID STRID-MITMUS            tõlgib STRID (ainsus) / STRID-MITMUS (mitmus)\n"
 "  ARV                           valib ainsuse/mitmuse vormi sellele arvule\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, fuzzy, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/fi.gmo b/gettext-runtime/po/fi.gmo
index 7de8a30..cb7ca0a 100644
--- a/gettext-runtime/po/fi.gmo
+++ b/gettext-runtime/po/fi.gmo
diff --git a/gettext-runtime/po/fi.po b/gettext-runtime/po/fi.po
index fb7d412..d55e3f1 100644
--- a/gettext-runtime/po/fi.po
+++ b/gettext-runtime/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-09-01 18:46+0300\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -94,7 +94,7 @@ msgid "memory exhausted"
 msgstr "muisti loppui"
 
 # Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -107,7 +107,7 @@ msgstr ""
 "Tämä on vapaa ohjelmisto ja sen muuttaminen ja levittäminen edelleen on sallittua.\n"
 "Ohjelmalle EI ANNETA TAKUUTA lain sallimissa rajoissa.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Tekijä: %s\n"
@@ -117,17 +117,17 @@ msgstr "Tekijä: %s\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "liian monta argumenttia"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "ei riittävästi argumentteja"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Yritä ’%s --help’ saadaksesi lisää tietoja.\n"
@@ -198,7 +198,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu."
@@ -218,7 +218,7 @@ msgid "standard input"
 msgstr "vakiosyötettä"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -279,12 +279,12 @@ msgstr ""
 "valitusta viestiluettelosta löydetyt viestit näytetään käännettyinä.\n"
 "Perushakemisto, josta haku suoritetaan: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Käyttö: %s [VALITSIN] [KÄÄNNÖSJOUKKO] VIESTI-ID VIESTI-ID-MONIKKO MÄÄRÄ\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -293,7 +293,7 @@ msgstr ""
 "Näyttää kotoistetun käännöksen tekstimuotoiselle viestille, jonka muoto\n"
 "riippuu lukuarvosta.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -314,7 +314,7 @@ msgstr ""
 "  MÄÄRÄ                     valitse yksikkö-/monikkomuoto tämän arvon\n"
 "                              perusteella\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/fr.gmo b/gettext-runtime/po/fr.gmo
index 2b4dea7..d6e89d8 100644
--- a/gettext-runtime/po/fr.gmo
+++ b/gettext-runtime/po/fr.gmo
diff --git a/gettext-runtime/po/fr.po b/gettext-runtime/po/fr.po
index fdcb67f..1a01975 100644
--- a/gettext-runtime/po/fr.po
+++ b/gettext-runtime/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-12-22 23:57+0100\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -96,7 +96,7 @@ msgstr "%s : l'option « -W %s » exige un argument\n"
 msgid "memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -109,7 +109,7 @@ msgstr ""
 "Ceci est un logiciel libre : vous pouvez le modifier et le redistribuer.\n"
 "Il n'y a PAS DE GARANTIE, dans la mesure de ce que permet la loi.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
@@ -119,17 +119,17 @@ msgstr "Écrit par %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "arguments manquants"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayez « %s --help ».\n"
@@ -199,7 +199,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapportez tout problème fonctionnel à <bug-gnu-gettext@gnu.org>.\n"
 
@@ -213,7 +213,7 @@ msgid "standard input"
 msgstr "entrée standard"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -273,12 +273,12 @@ msgstr ""
 "\n"
 "Dossier standard de recherche : %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Usage : %s [OPTION] [DOMAINE] MSGID MSGID-PLURIEL VALEUR\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -287,7 +287,7 @@ msgstr ""
 "Afficher la traduction en langue native d'un message textuel dont\n"
 "la forme grammaticale dépend d'un nombre\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -308,7 +308,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL     traduit le MSGID (singulier) / MSGID-PLURAL (pluriel)\n"
 "  VALEUR                 choisit la forme singulier/pluriel selon la VALEUR\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/ga.gmo b/gettext-runtime/po/ga.gmo
index 8ec64dc..42a5ea0 100644
--- a/gettext-runtime/po/ga.gmo
+++ b/gettext-runtime/po/ga.gmo
diff --git a/gettext-runtime/po/ga.po b/gettext-runtime/po/ga.po
index 5d657ed..c81ef18 100644
--- a/gettext-runtime/po/ga.po
+++ b/gettext-runtime/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2007-10-14 12:15-0500\n"
 "Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -89,7 +89,7 @@ msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n"
 msgid "memory exhausted"
 msgstr "cuimhne ídithe"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -102,7 +102,7 @@ msgstr ""
 "Is saorbhogearra é seo: ceadaítear duit é a athrú agus a athdháileadh.\n"
 "Níl baránta AR BITH ann, an oiread atá ceadaithe de réir dlí.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Le %s.\n"
@@ -112,17 +112,17 @@ msgstr "Le %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "an iomarca argóintí"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "argóintí ar iarraidh"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fháil.\n"
@@ -192,7 +192,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Seol tuairiscí fabhtanna chuig <bug-gnu-gettext@gnu.org>.\n"
 
@@ -206,7 +206,7 @@ msgid "standard input"
 msgstr "ionchur caighdeánach"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -266,12 +266,12 @@ msgstr ""
 "teachtaireachtaí atá aimsithe sa chatalóg roghnaithe.\n"
 "Gnáthchomhadlann chuardaigh: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Úsáid: %s [ROGHA] [FEARANN] MSGID MSGID-PLURAL LÍON\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -280,7 +280,7 @@ msgstr ""
 "Taispeáin an t-aistriúchán sa teanga dhúchais de theachtaireacht\n"
 "a bhfuil a foirm ghramadach spleách ar uimhir.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -301,7 +301,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        aistrigh MSGID (uatha) / MSGID-PLURAL (iolra)\n"
 "  LÍON                      roghnaigh uatha/iolra de réir an luacha seo\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/gettext-runtime.pot b/gettext-runtime/po/gettext-runtime.pot
index 8fd325e..9d5061a 100644
--- a/gettext-runtime/po/gettext-runtime.pot
+++ b/gettext-runtime/po/gettext-runtime.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.19.7\n"
+"Project-Id-Version: GNU gettext-runtime 0.19.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,7 +91,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr ""
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -100,7 +100,7 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
@@ -110,17 +110,17 @@ msgstr ""
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr ""
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr ""
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
@@ -182,7 +182,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
@@ -196,7 +196,7 @@ msgid "standard input"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -238,19 +238,19 @@ msgid ""
 "Standard search directory: %s\n"
 msgstr ""
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr ""
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -263,7 +263,7 @@ msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/gl.gmo b/gettext-runtime/po/gl.gmo
index 0bf198a..cf36b8b 100644
--- a/gettext-runtime/po/gl.gmo
+++ b/gettext-runtime/po/gl.gmo
diff --git a/gettext-runtime/po/gl.po b/gettext-runtime/po/gl.po
index 57be39a..5e256c8 100644
--- a/gettext-runtime/po/gl.po
+++ b/gettext-runtime/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-09-09 16:05+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -98,7 +98,7 @@ msgstr "%s: a opción «-W %s» require un argumento\n"
 msgid "memory exhausted"
 msgstr "memoria esgotada"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -111,7 +111,7 @@ msgstr ""
 "Isto é software libre: ten a liberdade para cambialo e redistribuílo.\n"
 "Non hai GARANT�AS, ata onde o permita a lei.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -121,17 +121,17 @@ msgstr "Escrito por %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "faltan argumentos"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Use «%s --help» para obter máis información.\n"
@@ -201,7 +201,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -215,7 +215,7 @@ msgid "standard input"
 msgstr "entrada estándar"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -276,19 +276,19 @@ msgstr ""
 "no catálogo escollido.\n"
 "Directorio estándar de busca: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uso: %s [OPCIÓN] [DOMINIO] MSGID MSGID-PLURAL NÚMERO\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Mostra a tradución a un idioma dunha mensaxe de texto cuxa forma gramatical depende dun número.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -309,7 +309,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        traducir MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  NÚMERO                    escoller a forma singular/plural segundo este valor\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/hr.gmo b/gettext-runtime/po/hr.gmo
index bee81a5..c7243f3 100644
--- a/gettext-runtime/po/hr.gmo
+++ b/gettext-runtime/po/hr.gmo
diff --git a/gettext-runtime/po/hr.po b/gettext-runtime/po/hr.po
index e1461e1..9efc2cd 100644
--- a/gettext-runtime/po/hr.po
+++ b/gettext-runtime/po/hr.po
@@ -1,15 +1,15 @@
 # Translation of gettext-runtime to Croatian.
-# Copyright © 2012 Free Software Foundation, Inc.
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
 #
+# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.18\n"
+"Project-Id-Version: gettext-runtime-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2012-11-02 14:40+0100\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-03-30 12:23-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
@@ -17,84 +17,98 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-Basepath: ../../Downloads/gettext-0.19.7-rc1/gettext-runtime/src\n"
+"X-Poedit-SearchPath-0: .\n"
 
 # Provjeriti koje nazive parametara i varijabli okoline treba prevesti... (TK)
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "greška pisanja"
 
+# Unrecognized is a synonym of unknown.
+# unrecognized is not recognized;
+# unknown is not known,  unidentified, not well known
 #: gnulib-lib/error.c:191
 msgid "Unknown system error"
 msgstr "Nepoznata greška sustava"
 
+# ambiguous: having or ​expressing more than one ​possible ​meaning
+# ambiguous: able to be understood in more than one way
+# ambiguous se �ešće prevodi s „dvosmislen“ ali ....
 #: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcija „%s� je višezna�na\n"
+msgstr "%s: opcija „%s“ je višezna�na; mogućnosti:"
 
+# promijena svih završnih navodnika s „ na “
 #: gnulib-lib/getopt.c:619
 #, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: opcija „%s� je višezna�na\n"
+msgstr "%s: opcija „%s“ je višezna�na\n"
 
+# http://ihjj.hr/: „dopustiti“ umjesto „dozvoliti“. Umjesto „ne dopušta“/„zahtijeva“ predlažem „ne o�ekuje“/„o�ekuje“
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opcija „--%s� ne dozvoljava argument\n"
+msgstr "%s: opcija „--%s“ ne dopušta argument\n"
 
 #: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opcija „%c%s� ne dozvoljava argument\n"
+msgstr "%s: opcija „%c%s“ ne dopušta argument\n"
 
 #: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opcija „--%s� zahtijeva argument\n"
+msgstr "%s: opcija „--%s“ zahtijeva argument\n"
 
+# http://wikidiff.com/unknown/unrecognized: Unrecognized is a synonym of unknown; lingivisti ne preporu�uju „nepropoznata“, ako se koristi „nije prepoznata“
 #: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neprepoznata opcija „--%s�\n"
+msgstr "%s: nepoznata opcija „--%s“\n"
 
 #: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neprepoznata opcija „%c%s�\n"
+msgstr "%s: nepoznata opcija „%c%s“\n"
 
 #: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: neispravna opcija -- „%c�\n"
+msgstr "%s: neispravna opcija -- „%c“\n"
 
 #: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
 #: gnulib-lib/getopt.c:1136
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opcija zahtijeva argument -- „%c�\n"
+msgstr "%s: opcija zahtijeva argument -- „%c“\n"
 
 #: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcija „-W %s� je višezna�na\n"
+msgstr "%s: opcija „-W %s“ je višezna�na\n"
 
 #: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opcija „-W %s� ne dozvoljava argument\n"
+msgstr "%s: opcija „-W %s“ ne dopušta argument\n"
 
 #: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcija „-W %s� zahtijeva argument\n"
+msgstr "%s: opcija „-W %s“ zahtijeva argument\n"
 
+# doslovni prijevod iscrpljen ima više smisao izmu�en = malaksao
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
-msgstr "memorija iscrpljena"
+msgstr "nema dovoljno memorije"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+# http://ihjj.hr/ ppreporu�uje „licencija“ umjesto „licenca“; jamstva umjesto jamstava
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -103,11 +117,11 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright © %s Free Software Foundation, Inc.\n"
-"Licenca GPLv3+: GNU GPL ina�ica 3 ili novija <http://gnu.org/licenses/gpl.html>\n"
-"Ovo je slobodan softver: slobodno ga smijete mijenjati i dijeliti.\n"
-"NEMA JAMSTAVA, do krajnje mjere dozvoljene zakonom.\n"
+"Licencija GPLv3+: GNU GPL ina�ica 3 ili novija <http://gnu.org/licenses/gpl.html>\n"
+"Ovo je slobodan softver: slobodno ga mijenjajte i dijelite.\n"
+"NEMA JAMSTVA, do granica dopuštenih zakonom.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napisao %s.\n"
@@ -117,56 +131,62 @@ msgstr "Napisao %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "previše argumenata"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "nedostaju argumenti"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
-#, fuzzy, c-format
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
+#, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "Pokušajte „%s --help� za više informacija.\n"
+msgstr "„%s --help“ pomoć za uporabu i dodatne obavijesti.\n"
 
+# gettext manual 15.5.2.3
+# SHELL-FORMAT su strings, as supported by  gettext and the ‘envsubst’ program, are strings with references to shell variables in the form $variable or ${variable}.
+# Naziv SHELL-FORMAT (LJUSKA-FORMAT) je zbunjujući. Predložiti neku drugu rije� za SHELL-FORMAT?
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Uporaba: %s [OPCIJA] [OBLIK-LJUSKE]\n"
+msgstr "Uporaba: %s [OPCIJA] [LJUSKA-FORMAT]\n"
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "Zamjenjuje vrijednosti varijabli okoline.\n"
 
+# Operation mode (za razliku Mode of Operation) je više „u toku rada, u toku procesiranja“
 #: src/envsubst.c:185
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "Na�in rada:\n"
+msgstr "U procesiranju:\n"
 
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             ispiši varijable koje se nalaze u OBLIK-LJUSKE\n"
+msgstr "  -v, --variables             ispis varijabli navedenih u LJUSKA-FORMAT\n"
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "Informativni izlaz:\n"
+msgstr "Dodatne obavijesti:\n"
 
+# http://ihjj.hr iziđi umjesto izađi: „prikaži pomoć i iziđi“ Ili kraće samo „pomoć“, ili „ova pomoć“; glagoli nisu nužni, jer je iz konteksta sve jasno.
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  prikaži ovu pomoć i izađi\n"
+msgstr "  -h, --help                  prikaži pomoć i iziđi\n"
 
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               ispiši informacije o ina�ici i izađi\n"
+msgstr "  -V, --version               podaci o ina�ici\n"
 
+# envsubst:Substitutes environment variables in „shell format strings“ ali samo (i samo onda) ako su formatu $VARIJABLA ili ${VARIJABLA}!
 #: src/envsubst.c:202
 #, c-format, no-wrap
 msgid ""
@@ -177,12 +197,12 @@ msgid ""
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"U normalnom na�inu rada, standardni ulaz se kopira na standardni izlaz,\n"
-"gdje se reference na varijable okoline oblika $VARIABLE ili ${VARIABLE}\n"
-"zamjenjuju odgovarajućim vrijednostima. Ako je zadan OBLIK-LJUSKE, samo\n"
-"se one varijable okoline referencirane u OBLIK-LJUSKE zamjenjuju, ina�e\n"
-"se zamjenjuju reference na sve varijable okoline koje se pojavljuju na\n"
-"standardnom ulazu.\n"
+"U normalnom procesiranju, standardni se ulaz kopira na standardni izlaz,\n"
+"s time da se referencije na varijable okoline u formatu $VARIJABLA ili\n"
+"${VARIJABLA} zamijene odgovarajućim vrijednostima. Ako je LJUSKA-FORMAT\n"
+"zadan, onda će samo one varijable okoline s referencijom u LJUSKA-FORMAT\n"
+"biti zamijenjene; u suprotnom, sve varijable okoline koje se\n"
+"pojavljuju na standardnom ulazu bit će zamijenjene.\n"
 
 #: src/envsubst.c:211
 #, c-format, no-wrap
@@ -190,47 +210,56 @@ msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
 "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
 msgstr ""
-"Kada se koristi --variables, standardni ulaz se zanemaruje, a izlaz sadrži\n"
-"varijable okoline referencirane u OBLIK-LJUSKE, jedna po retku.\n"
+"Ako se upotrijebi --variables, standardni ulaz je zanemaren, a izlaz se\n"
+"sastoji od onih varijabli okoline s referencijom u LJUSKA-FORMAT,\n"
+"po jedna po retku.\n"
 
+# Savjet lingvista: Ako može, onda je bolje upotrijebiti hrvatski red rije�i, prvo subjekt, pa onda veznici, predikati....
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
-"Prijavite greške na <bug-gnu-gettext@gnu.org>.\n"
-"Prijavite greške prijevoda na <lokalizacija@linux.hr>.\n"
+"Greškice (bugs) na engleskom javite na <bug-gnu-gettext@gnu.org>.\n"
+"Primjedbe i pogreške u prijevodu javite na <lokalizacija@linux.hr>.\n"
 
 #: src/envsubst.c:442
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "greška pri �itanju „%s�"
+msgstr "greška pri �itanju „%s“"
 
 #: src/envsubst.c:443
 msgid "standard input"
 msgstr "standardni ulaz"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
+# 15.5.2.3 Invoking the gettext program
+# gettext [option] [[textdomain] msgid]
+# gettext [option] -s [msgid]...
+# Upute koriste „msgid“, pa je možda bolje ne prevađati tu rije�.
 #: src/gettext.c:244
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"Uporaba: %s [OPCIJA] [[TEKSTDOMENA] ID-PORUKE]\n"
-"ili:     %s [OPCIJA] -s [ID-PORUKE]...\n"
+"Uporaba: %s [OPCIJA] [[TEKSTDOMENA] MSGID]\n"
+"ili:     %s [OPCIJA] -s [MSGID]...\n"
 
+# http://ihjj.hr: „materinji“ > „materinski“
 #: src/gettext.c:250
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "Prikaži prijevod tekstualne poruke na materinji jezik.\n"
+msgstr "Prijevod tekstualne poruke na materinski jezik.\n"
 
+# „retrieve“ podrazumijeva implicitno postojane prijevoda; ako prijevoda nema, onda ga ne može „retrieve“; zato promjena  „retrieve“ >  „traži“
+# jd./mn. za poruke slijedi gettext Manual.
 #: src/gettext.c:254
 #, c-format, no-wrap
 msgid ""
@@ -243,17 +272,17 @@ msgid ""
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=TEKSTDOMENA  dohvati prevedene poruke iz TEKSTDOMENA\n"
-"  -e                        omogući proširivanje nekih izlaznih nizova\n"
-"  -E                        (zanemareno zbog kompatibilnosti)\n"
-"  -h, --help                prikaži ovu pomoć i izađi\n"
-"  -n                        izostavi završnu oznaku novog retka\n"
-"  -V, --version             prikaži informacije o ina�ici i izađi\n"
-"  [TEKSTDOMENA] [ID-PORUKE] dohvati prevedene poruke koje odgovaraju\n"
-"                            ID-PORUKE iz TEKSTDOMENA\n"
+"  -d, --domain=TEKSTDOMENA  traži prevedene poruke iz TEKSTDOMENA\n"
+"  -e                        proširenje nekih „escape“ sekvencija\n"
+"  -E                        (zanemaruju se zbog kompatibilnosti)\n"
+"  -h, --help                prikaži pomoć i iziđi\n"
+"  -n                        bez završnog „newline“ znaka novog retka\n"
+"  -V, --version             podaci o ina�ici\n"
+"  [TEKSTDOMENA] MSGID       potraži prevedenu poruku za MSGID\n"
+"                            iz TEKSTDOMENA\n"
 
 #: src/gettext.c:265
-#, fuzzy, c-format, no-wrap
+#, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
 "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
@@ -264,29 +293,40 @@ msgid ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Ako parametar TEKSTDOMENA nije naveden, domena se određuje iz varijable\n"
-"okoline TEXTDOMAIN. Ako katalog poruka nije pronađen u uobi�ajenom\n"
-"direktoriju, druga lokacija se može navesti varijablom okoline TEXTDOMAINDIR.\n"
-"Kada se koristi uz opciju -s, program se ponaša kao naredba „echo�, no ne\n"
-"kopira argumente na standardni izlaz, već prevodi poruke pronađene u\n"
-"odabranom katalogu.\n"
+"Ako parametar TEKSTDOMENA nije naveden, domenu određuje varijabla okoline\n"
+"TEXTDOMAIN. Ako pak katalog poruka nije pronađen u uobi�ajenom direktoriju,\n"
+"alternativna lokacija može se zadati varijablom okoline TEXTDOMAINDIR.\n"
+"\n"
+"Kad se upotrijebi opcija „-s“, program se ponaša kao naredba „echo“.\n"
+"No umjesto jednostavnog ispisa svih svojih argumenata, program ispiše\n"
+"njihove prijevode ako ih nađe u odabranom katalogu (TEXTDOMENA).\n"
+"\n"
 "Uobi�ajeni direktorij za pretragu: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "Uporaba: %s [OPCIJA] [TEXTDOMAIN] ID-PORUKE ID-MNOŽINE BROJ\n"
+msgstr "Uporaba: %s [OPCIJA] [TEXTDOMENA] MSGID MSGID-PLURAL BROJ\n"
 
-#: src/ngettext.c:218
+# http://ihjj.hr: „materinji“ > „materinski“
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
-"Prikaži prijevod tekstualne poruke �iji gramati�ki oblik ovisi o broju na\n"
-"materinji jezik.\n"
-
-#: src/ngettext.c:223
+"Prijevod tekstualne poruke koja sadrži brojeve na\n"
+"materinski jezik pazeći na gramati�ka pravila za brojeve.\n"
+
+# 15.5.2.4 Invoking the ngettext program
+# ngettext [option] [textdomain] msgid msgid-plural count
+# U uputama „messages“ su u pluralu, u po file su u singularu. Slijedimo Upute.
+# „retrieve“ podrazumijeva implicitno
+# postojane prijevoda; ako prijevoda
+# nema, onda ga ne može „retrieve“; zato
+# promjena  „retrieve“ >  „traži“
+# jd./mn. za poruke slijedi gettext Manual.
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -298,17 +338,16 @@ msgid ""
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEKSTDOMENA  dohvati prevedenu poruku iz TEKSTDOMENA\n"
-"  -e                        omogući proširivanje nekih izlaznih nizova\n"
-"  -E                        (zanemareno zbog kompatibilnosti)\n"
-"  -h, --help                prikaži ovu pomoć i izađi\n"
-"  -V, --version             prikaži informacije o ina�ici i izađi\n"
-"  [TEKSTDOMENA]             dohvati prevedenu poruku iz TEKSTDOMENA\n"
-"  ID-PORUKE ID-MNOŽINE      prevedi ID-PORUKE (jednina) / ID-MNOŽINE (množina)\n"
-"  BROJ                      odaberi oblik jednine/množine ovisno o ovoj\n"
-"                            vrijednosti\n"
-
-#: src/ngettext.c:234
+"  -d, --domain=TEKSTDOMENA  traži prevedene poruke iz TEKSTDOMENA\n"
+"  -e                        proširenje nekih „escape“ sekvencija\n"
+"  -E                        (zanemaruju se zbog kompatibilnosti)\n"
+"  -h, --help                prikaži pomoć i iziđi\n"
+"  -V, --version             podaci o ina�ici\n"
+"  [TEKSTDOMENA]             potraži prevedenu poruku iz TEKSTDOMENA\n"
+"  MSGID MSGID-PLURAL        prijevod za MSGID (jd.) ili za MSGID-PLURAL (mn.)\n"
+"  BROJ                      izbor jd. ili oblika mn. zavisi o veli�ini BROJ\n"
+
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -317,7 +356,8 @@ msgid ""
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"Ako parametar TEKSTDOMENA nije naveden, domena se određuje iz varijable\n"
-"okoline TEXTDOMAIN. Ako katalog poruka nije pronađen u uobi�ajenom\n"
-"direktoriju, druga lokacija se može navesti varijablom okoline TEXTDOMAINDIR.\n"
+"Ako parametar TEKSTDOMENA nije naveden, domenu određuje varijabla okoline\n"
+"TEXTDOMAIN. Ako pak katalog poruka nije pronađen u uobi�ajenom direktoriju,\n"
+"alternativna lokacija može se zadati varijablom okoline TEXTDOMAINDIR.\n"
+"\n"
 "Uobi�ajeni direktorij za pretragu: %s\n"
diff --git a/gettext-runtime/po/hu.gmo b/gettext-runtime/po/hu.gmo
index ea3293d..46438d9 100644
--- a/gettext-runtime/po/hu.gmo
+++ b/gettext-runtime/po/hu.gmo
diff --git a/gettext-runtime/po/hu.po b/gettext-runtime/po/hu.po
index 35ad725..40a7553 100644
--- a/gettext-runtime/po/hu.po
+++ b/gettext-runtime/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-23 20:33+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -92,7 +92,7 @@ msgstr "%s: a „-W %s� kapcsolóhoz egy argumentum szükséges\n"
 msgid "memory exhausted"
 msgstr "elfogyott a memória"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -105,7 +105,7 @@ msgstr ""
 "Ez egy szabad szoftver: szabadon módosíthatja és terjesztheti.\n"
 "Nincs SEMMIFÉLE GARANCIA, a törvény által megengedett mértékben.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�rta: %s.\n"
@@ -115,17 +115,17 @@ msgstr "�rta: %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "túl sok argumentum"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "hiányzó argumentumok"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "További információkért próbálja a(z) „%s --help� parancsot.\n"
@@ -195,7 +195,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "A hibákat ezen a címen jelentse: <bug-gnu-gettext@gnu.org>.\n"
 
@@ -209,7 +209,7 @@ msgid "standard input"
 msgstr "szabványos bemenet"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -271,12 +271,12 @@ msgstr ""
 "fordítva.\n"
 "Szabványos keresési könyvtár: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Használat: %s [KAPCSOLÓ] [SZÖVEGTARTOM�NY] MSGID MSGID-TÖBBES DARABSZ�M\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -285,7 +285,7 @@ msgstr ""
 "Azon szöveges üzenet natív nyelvi fordításának megjelenítése, amelyek\n"
 "nyelvtani alakja egy számtól függ.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -307,7 +307,7 @@ msgstr ""
 "  MSGID MSGID-TÖBBES        MSGID (egyesszám) / MSGID-TÖBBES (többesszám)\n"
 "  DARABSZ�M               egyesszám/többesszám választása ezen érték alapján\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/id.gmo b/gettext-runtime/po/id.gmo
index f678de4..5ea384a 100644
--- a/gettext-runtime/po/id.gmo
+++ b/gettext-runtime/po/id.gmo
diff --git a/gettext-runtime/po/id.po b/gettext-runtime/po/id.po
index cf80a1d..ca25d35 100644
--- a/gettext-runtime/po/id.po
+++ b/gettext-runtime/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2010-05-24 13:00+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -93,7 +93,7 @@ msgstr "%s: pilihan '-W %s' memerlukan sebuah argumen\n"
 msgid "memory exhausted"
 msgstr "kehabisan memori"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -106,7 +106,7 @@ msgstr ""
 "Ini adalah piranti lunak bebas: anda bebas untuk mengubah dan meredistribusikannya.\n"
 "TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
@@ -116,17 +116,17 @@ msgstr "Ditulis oleh %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "Argumen hilang"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
@@ -197,7 +197,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Laporkan kesalahan ke <bug-gnu-gettext@gnu.org>.\n"
 
@@ -211,7 +211,7 @@ msgid "standard input"
 msgstr "standard input"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -271,12 +271,12 @@ msgstr ""
 "diterjemahkan.\n"
 "Direktori pencarian standar: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Pemakaian: %s [PILIHAN] [TEXTDOMAIN] ID-PESAN ID-PESAN-PLURAL JUMLAH\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -285,7 +285,7 @@ msgstr ""
 "Tampilkan terjemahan bahasa asli pesan tekstual yang bentuk gramatikalnya\n"
 "tergantung pada suatu angka.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -307,7 +307,7 @@ msgstr ""
 "  ID-PESAN ID-PESAN-PLURAL  terjemahkan ID-PESAN (tunggal) / ID-PESAN-PLURAL (plural)\n"
 "  JUMLAH                    pilih bentuk tunggal/plural berdasarkan nilai ini\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/it.gmo b/gettext-runtime/po/it.gmo
index eb06305..cfc1554 100644
--- a/gettext-runtime/po/it.gmo
+++ b/gettext-runtime/po/it.gmo
diff --git a/gettext-runtime/po/it.po b/gettext-runtime/po/it.po
index 2e4aeb1..1f72817 100644
--- a/gettext-runtime/po/it.po
+++ b/gettext-runtime/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-08-05 12:00+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -91,7 +91,7 @@ msgstr "%s: l'opzione '-W %s' richiede un argomento\n"
 msgid "memory exhausted"
 msgstr "memoria esaurita"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -105,7 +105,7 @@ msgstr ""
 "Questo è software libero: siete liberi di cambiarlo e redistribuirlo.\n"
 "NON c'è alcuna garanzia, fino agli estremi permessi dalla legge.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scritto da %s.\n"
@@ -115,17 +115,17 @@ msgstr "Scritto da %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "argomenti mancanti"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Usare '%s --help' per maggiori informazioni.\n"
@@ -197,7 +197,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -211,7 +211,7 @@ msgid "standard input"
 msgstr "standard input"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -270,12 +270,12 @@ msgstr ""
 "traduce i messaggi trovati nel catalogo selezionato.\n"
 "Directory di ricerca standard: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uso: %s [OPZIONE] [DOMINIOTESTO] MSGID MSGID-PLURAL NUMERO\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -284,7 +284,7 @@ msgstr ""
 "Mostra la traduzione di un messaggio di testo, la cui forma grammaticale\n"
 "dipende da un numero, in linguaggio nativo.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -307,7 +307,7 @@ msgstr ""
 "                            questo valore\n"
 "\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/ja.gmo b/gettext-runtime/po/ja.gmo
index 61a9ae4..6161b9e 100644
--- a/gettext-runtime/po/ja.gmo
+++ b/gettext-runtime/po/ja.gmo
diff --git a/gettext-runtime/po/ja.po b/gettext-runtime/po/ja.po
index 23a3c01..38d5998 100644
--- a/gettext-runtime/po/ja.po
+++ b/gettext-runtime/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-24 12:18+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -91,7 +91,7 @@ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
 msgid "memory exhausted"
 msgstr "¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -109,7 +109,7 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¡¦¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹. ²þÊѤȺÆÇÛÉۤϼ«Í³¤Ç¤¹.\n"
 "Ë¡¤Çµö¤µ¤ì¤¿ÈÏ°ÏÆâ¤Ç̵ÊݾڤǤ¹.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ºî¼Ô %s.\n"
@@ -119,17 +119,17 @@ msgstr "ºî¼Ô %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "¤è¤ê¿¤¯¤Î¾ðÊó¤òÆÀ¤ë¤¿¤á¤Ë¤Ï '%s --help' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤.\n"
@@ -197,7 +197,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï <bug-gnu-gettext@gnu.org> ¤Þ¤Ç.\n"
 
@@ -211,7 +211,7 @@ msgid "standard input"
 msgstr "ɸ½àÆþÎÏ"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -271,19 +271,19 @@ msgstr ""
 "ËÝÌõ¤µ¤ì¤¿¤â¤Î¤òɽ¼¨¤·¤Þ¤¹.\n"
 "ɸ½à¤Î¸¡º÷¥Ç¥£¥ì¥¯¥È¥ê: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "ʸˡ¾å, ·Á¼°¤¬¿ô¤Ë¤è¤Ã¤Æ°Û¤Ê¤Ã¤Æ¤¤¤ë¸¶Ê¸¥á¥Ã¥»¡¼¥¸¤Î¼«¹ñ¸ìËÝÌõ¤òɽ¼¨.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -304,7 +304,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        MSGID (ñ¿ô·Á) / MSGID-PLURAL (Ê£¿ô·Á) ¤òËÝÌõ\n"
 "  COUNT                     ¤³¤ÎÃͤò´ðËܤˤ·¤Æñ¿ô/Ê£¿ô·Á¤òÁªÂò\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/ko.gmo b/gettext-runtime/po/ko.gmo
index 4b492b1..961c0b1 100644
--- a/gettext-runtime/po/ko.gmo
+++ b/gettext-runtime/po/ko.gmo
diff --git a/gettext-runtime/po/ko.po b/gettext-runtime/po/ko.po
index 1e6627c..f3ca6ba 100644
--- a/gettext-runtime/po/ko.po
+++ b/gettext-runtime/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-28 05:22+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@googlegroups.com>\n"
@@ -93,7 +93,7 @@ msgstr "%s: '-W %s' 옵션� �수가 필요합니다\n"
 msgid "memory exhausted"
 msgstr "메모리가 바닥났습니다"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -106,7 +106,7 @@ msgstr ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s�(가) 만들었습니다.\n"
@@ -116,17 +116,17 @@ msgstr "%s�(가) 만들었습니다.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "�수가 너무 많�"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "�수가 빠졌�"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "� 많� 정보를 보려면 '%s --help' 하십시오.\n"
@@ -194,7 +194,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "<bug-gnu-gettext@gnu.org>로 문제�� 알려 주십시오.\n"
 
@@ -208,7 +208,7 @@ msgid "standard input"
 msgstr "표준 입력"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -268,12 +268,12 @@ msgstr ""
 "목��서 번역�어 있는 메시지만� 출력�니다.\n"
 "기본 �색 디렉터리: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "사용법: %s [<옵션>] [<TEXTDOMAIN>] <MSGID> <MSGID-PLURAL> <개수>\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -282,7 +282,7 @@ msgstr ""
 "숫�� 따� 문법� 달�지는, 주어진 메시지� 대한 고유어 번역문�\n"
 "표시합니다.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -303,7 +303,7 @@ msgstr ""
 "  MSGID MSGID-복수형        MSGID(단수) / MSGID-복수형(복수)� 번역합니다\n"
 "  개수                      � 값� 따� 단수/복수를 결정합니다\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/nb.gmo b/gettext-runtime/po/nb.gmo
index c72d057..ade85e1 100644
--- a/gettext-runtime/po/nb.gmo
+++ b/gettext-runtime/po/nb.gmo
diff --git a/gettext-runtime/po/nb.po b/gettext-runtime/po/nb.po
index a261f0b..eb18a85 100644
--- a/gettext-runtime/po/nb.po
+++ b/gettext-runtime/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-12-23 03:17+0100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -93,7 +93,7 @@ msgstr "%s: valget «%s» krever et argument\n"
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -106,7 +106,7 @@ msgstr ""
 "Dette er Fri programvare: du står fritt til å endre og redistribuere det.\n"
 "Det er INGEN GARANTI, i den grad loven tillater.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet av %s.\n"
@@ -116,17 +116,17 @@ msgstr "Skrevet av %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "mangler argumenter"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
@@ -196,7 +196,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
@@ -212,7 +212,7 @@ msgid "standard input"
 msgstr "standard inn"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -272,12 +272,12 @@ msgstr ""
 "stedet blir meldinger funnet i den valgte katalogen oversatt.\n"
 "Standard søkekatalog er: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Bruk: %s [VALG] [TEKSTDOMENE] MSGID MSGID-FLERTALL ANTALL\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -286,7 +286,7 @@ msgstr ""
 "Vis morsmåloversettelse av en tekstmelding hvis grammatiske\n"
 "form avhenger av et tall.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -307,7 +307,7 @@ msgstr ""
 "  MSGID MSGID-FLERTALL        oversett MSGID (entall) / MSGID-FLERTALL (flertall)\n"
 "  COUNT                     velg entalls-/flertallsform basert på denne verdien\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/nl.gmo b/gettext-runtime/po/nl.gmo
index eebec45..249c29c 100644
--- a/gettext-runtime/po/nl.gmo
+++ b/gettext-runtime/po/nl.gmo
diff --git a/gettext-runtime/po/nl.po b/gettext-runtime/po/nl.po
index 78cae69..b368f1e 100644
--- a/gettext-runtime/po/nl.po
+++ b/gettext-runtime/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-07-01 21:01+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -96,7 +96,7 @@ msgstr "%s: optie '-W %s' vereist een argument\n"
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -109,7 +109,7 @@ msgstr ""
 "Dit is vrije software: u mag het vrijelijk wijzigen en verder verspreiden.\n"
 "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
@@ -119,17 +119,17 @@ msgstr "Geschreven door %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "te veel argumenten"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "ontbrekende argumenten"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
@@ -200,7 +200,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapporteer gebreken in het programma aan <bug-gnu-gettext@gnu.org>;\n"
@@ -216,7 +216,7 @@ msgid "standard input"
 msgstr "standaardinvoer"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -276,12 +276,12 @@ msgstr ""
 "in de gekozen catalogus gevonden worden.\n"
 "De standaard zoekmap is: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Gebruik:  %s [OPTIE] [TEKSTDOMEIN] MSGID MSGID-MEERVOUD AANTAL\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -290,7 +290,7 @@ msgstr ""
 "Toont de vertaling van een tekstbericht waarvan de grammaticale vorm\n"
 "afhangt van een getal.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -311,7 +311,7 @@ msgstr ""
 "  MSGID MSGID-MEERVOUD      MSGID (enkelvoud) en MSGID-MEERVOUD vertalen\n"
 "  AANTAL                    enkel- of meervoud kiezen gebaseerd op deze waarde\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/nn.gmo b/gettext-runtime/po/nn.gmo
index 3994be3..9e0b51f 100644
--- a/gettext-runtime/po/nn.gmo
+++ b/gettext-runtime/po/nn.gmo
diff --git a/gettext-runtime/po/nn.po b/gettext-runtime/po/nn.po
index 05e4f68..de4906e 100644
--- a/gettext-runtime/po/nn.po
+++ b/gettext-runtime/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2008-08-13 18:40+0200\n"
 "Last-Translator: Eirik U. Birkeland <eirbir@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -93,7 +93,7 @@ msgstr "%s: Valet «%s» treng eit argument\n"
 msgid "memory exhausted"
 msgstr "gjekk tom for minne"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -106,7 +106,7 @@ msgstr ""
 "Dette er fri programvare. Du kan fritt endra og distribuera henne vidare.\n"
 "Det er INGEN GARANTI for dette produktet utover det som står i lova.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrive av %s.\n"
@@ -116,17 +116,17 @@ msgstr "Skrive av %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "for mange argument"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "manglar argument"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon.\n"
@@ -195,7 +195,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-gettext@gnu.org>.\n"
 
@@ -209,7 +209,7 @@ msgid "standard input"
 msgstr "standard inndata"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -269,19 +269,19 @@ msgstr ""
 "meldingar som er funne i den valde katalogen omsette.\n"
 "Standard søkjekatalog er: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Bruk: %s [VAL] [TEKSTOMRDE] MSGID MSGID-PLURAL TAL\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Vis omsetjinga av ein tekststreng som har ei grammatisk form som er avhengig av eit tal.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -303,7 +303,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        omset MSGID (eintal) / MSGID-PLURAL (fleirtal)\n"
 "  TAL                       vel eintal-/fleirtalsform basert på denne verdien\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/pl.gmo b/gettext-runtime/po/pl.gmo
index d6ba603..1eefebd 100644
--- a/gettext-runtime/po/pl.gmo
+++ b/gettext-runtime/po/pl.gmo
diff --git a/gettext-runtime/po/pl.po b/gettext-runtime/po/pl.po
index bddf627..3fa820f 100644
--- a/gettext-runtime/po/pl.po
+++ b/gettext-runtime/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-07-15 18:54+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -93,7 +93,7 @@ msgstr "%s: opcja „-W %s� wymaga argumentu\n"
 msgid "memory exhausted"
 msgstr "pamięć wyczerpana"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -106,7 +106,7 @@ msgstr ""
 "To jest wolne oprogramowanie: możesz je modyfikować i rozpowszechniać.\n"
 "Autorzy NIE DAJÄ„ GWARANCJI, na ile pozwala na to prawo.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor programu: %s.\n"
@@ -116,17 +116,17 @@ msgstr "Autor programu: %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "za dużo argumentów"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "brakujÄ…ce argumenty"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Napisz „%s --help� żeby otrzymać więcej informacji.\n"
@@ -196,7 +196,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raporty o błędach wysyłaj do bug-gnu-gettext@gnu.org\n"
 
@@ -210,7 +210,7 @@ msgid "standard input"
 msgstr "standardowe wejście"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -270,19 +270,19 @@ msgstr ""
 "znalezione w wybranym katalogu.\n"
 "Domyślnie przeszukiwany katalog: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Składnia: %s [OPCJA] [DOMENA] MSGID MSGID-MNOGA ILOŚĆ\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Wyświetlenie tłumaczenia komunikatu, którego forma gramatyczna zależy od liczby\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -304,7 +304,7 @@ msgstr ""
 "  MSGID MSGID-MNOGA         przetłumaczenie MSGID (pojed.) / MSGID-MNOGA (mn.)\n"
 "  LICZBA                    wybranie formy pojed./mn. w oparciu o LICZBĘ\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/pt.gmo b/gettext-runtime/po/pt.gmo
index e7d4c70..873fc4d 100644
--- a/gettext-runtime/po/pt.gmo
+++ b/gettext-runtime/po/pt.gmo
diff --git a/gettext-runtime/po/pt.po b/gettext-runtime/po/pt.po
index 0c2392c..cf4587f 100644
--- a/gettext-runtime/po/pt.po
+++ b/gettext-runtime/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2007-12-09 18:24+0100\n"
 "Last-Translator: Helder Correia <helder.pereira.correia@gmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -90,7 +90,7 @@ msgstr "%s: a opção `%s' requere um argumento\n"
 msgid "memory exhausted"
 msgstr "memória esgotada"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -103,7 +103,7 @@ msgstr ""
 "Este software é livre: pode alterá-lo e redistribuí-lo.\n"
 "NÃO H� QUALQUER GARANTIA, até onde a lei o permite.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -113,17 +113,17 @@ msgstr "Escrito por %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "argumentos insuficientes"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Tente '%s --help' para mais informação.\n"
@@ -193,7 +193,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Reporte erros para <bug-gnu-gettext@gnu.org>.\n"
 
@@ -207,7 +207,7 @@ msgid "standard input"
 msgstr "entrada standard"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -268,12 +268,12 @@ msgstr ""
 "são traduzidas.\n"
 "Pasta padrão de pesquisa: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Utilização: %s [OPÇÃO] [DIALECTO] MSGID MSGID-PLURAL NÚMERO\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -282,7 +282,7 @@ msgstr ""
 "Exibir tradução de língua nativa de uma mensagem textual cujas formas\n"
 "gramaticais dependem de um número.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -303,7 +303,7 @@ msgstr ""
 " MSGID MSGID-PLURAL         traduzir MSGID (singular) / MSGID.PLURAL (plural)\n"
 " NÚMERO                     escolher forma singular/plural baseado neste valor\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/pt_BR.gmo b/gettext-runtime/po/pt_BR.gmo
index f455145..ea3f27f 100644
--- a/gettext-runtime/po/pt_BR.gmo
+++ b/gettext-runtime/po/pt_BR.gmo
diff --git a/gettext-runtime/po/pt_BR.po b/gettext-runtime/po/pt_BR.po
index 13cd512..1c34828 100644
--- a/gettext-runtime/po/pt_BR.po
+++ b/gettext-runtime/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-09-15 11:27-0300\n"
 "Last-Translator: Rafael Ferreira <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -96,7 +96,7 @@ msgstr "%s: opção \"-W %s\" requer um argumento\n"
 msgid "memory exhausted"
 msgstr "Memória insuficiente"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -109,7 +109,7 @@ msgstr ""
 "Este é  um software livre: você é livre para alterar e redistribui-lo.\n"
 "NÃO H� GARANTIA, à extensão permitida pela lei.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -119,17 +119,17 @@ msgstr "Escrito por %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "excesso de parâmetros"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "parâmetros não informados"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Tente \"%s --help\" para mais informações.\n"
@@ -200,7 +200,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Relate erros para <bug-gnu-gettext@gnu.org>.\n"
@@ -216,7 +216,7 @@ msgid "standard input"
 msgstr "entrada padrão"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -276,12 +276,12 @@ msgstr ""
 "mensagens encontradas no catálogo selecionado\n"
 "Diretório de pesquisa padrão: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uso: %s [OPÇÃO] [DOM�NIO] MSGID MSGID-PLURAL NÚMERO\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -290,7 +290,7 @@ msgstr ""
 "Exibe tradução de idioma nativo de uma mensagem textual cuja forma\n"
 "gramatical depende de um número.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -311,7 +311,7 @@ msgstr ""
 "  [DOM�NIO] MSGID           recupera mensagens traduzidas correspondentes\n"
 "                            para MSGID no DOM�NIO\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/ro.gmo b/gettext-runtime/po/ro.gmo
index d274aae..3980904 100644
--- a/gettext-runtime/po/ro.gmo
+++ b/gettext-runtime/po/ro.gmo
diff --git a/gettext-runtime/po/ro.po b/gettext-runtime/po/ro.po
index b008cb0..bb6cc87 100644
--- a/gettext-runtime/po/ro.po
+++ b/gettext-runtime/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2003-11-23 09:19+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -90,7 +90,7 @@ msgstr "%s: opþiunea `%s' necesitã un parametru\n"
 msgid "memory exhausted"
 msgstr "memorie plinã"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -99,7 +99,7 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
@@ -109,17 +109,17 @@ msgstr "Scris de %s.\n"
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "prea mulþi parametri"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "parametri lipsã"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Încercaþi `%s --help' pentru mai multe informaþii.\n"
@@ -191,7 +191,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raportaþi bug-urile la <bug-gnu-gettext@gnu.org>.\n"
 
@@ -205,7 +205,7 @@ msgid "standard input"
 msgstr "intrare(input) standard"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -265,12 +265,12 @@ msgstr ""
 "sunt traduse acele mesaje care sunt gãsite în catalogul selectat.\n"
 "Directorul de cãutare standard: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Folosire: %s [OPÞIUNE] [DOMENIU_TEXT] MSGID MSGID-PLURAL NUMÃRARE\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -279,7 +279,7 @@ msgstr ""
 "Afiºeazã traducerea din limba nativã a mesajului textual a cãrui formã\n"
 "gramaticalã depinde de un numãr.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -300,7 +300,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        traduce MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  NUMÃRARE                     alege forma singularã/pluralã bazatã pe aceastã valoare\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/ru.gmo b/gettext-runtime/po/ru.gmo
index 7e59fac..46ddc74 100644
--- a/gettext-runtime/po/ru.gmo
+++ b/gettext-runtime/po/ru.gmo
diff --git a/gettext-runtime/po/ru.po b/gettext-runtime/po/ru.po
index 90ab21b..a060b8d 100644
--- a/gettext-runtime/po/ru.po
+++ b/gettext-runtime/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-26 08:56+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -94,7 +94,7 @@ msgstr "%s: длÑ� параметра ?-W %s? требуетÑ�Ñ� аргуменÑ
 msgid "memory exhausted"
 msgstr "пам�ть и�черпана"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -107,7 +107,7 @@ msgstr ""
 "Это �вободное ПО: вы можете продавать и ра�про�тран�ть его.\n"
 "�ет �ИК�КИХ Г�Р��ТИЙ до �тепени, разрешённой законом.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�втор программы ? %s.\n"
@@ -117,17 +117,17 @@ msgstr "�втор программы ? %s.\n"
 msgid "Bruno Haible"
 msgstr "Бруно Хайбл"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "�лишком много аргументов"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "необходимо задать аргументы"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "По команде ?%s --help? можно получить дополнительную информацию.\n"
@@ -198,7 +198,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Об ошибках �ообщайте по адре�у <bug-gnu-gettext@gnu.org>.\n"
 
@@ -212,7 +212,7 @@ msgid "standard input"
 msgstr "�тандартный ввод"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ульрих Дреппер"
 
@@ -272,12 +272,12 @@ msgstr ""
 "�тандартный вывод, вывод�т�� их переводы из указанного домена.\n"
 "Стандартный каталог пои�ка: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "И�пользование: %s [П�Р�МЕТР] [ДОМЕ�] MSGID MSGID-PLURAL ЧИСЛО\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -286,7 +286,7 @@ msgstr ""
 "Отображает перевод тек�тового �ообщени�, грамматиче�ка� форма которого\n"
 "зави�ит от некоторого чи�ла.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -308,7 +308,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL     переве�ти MSGID (ед. чи�ло) / MSGID-PLURAL (мн. чи�ло)\n"
 "  ЧИСЛО                  выбрать ед./мн. чи�ло на о�нове �того значени�\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/sk.gmo b/gettext-runtime/po/sk.gmo
index ba63825..6bb6955 100644
--- a/gettext-runtime/po/sk.gmo
+++ b/gettext-runtime/po/sk.gmo
diff --git a/gettext-runtime/po/sk.po b/gettext-runtime/po/sk.po
index 9fecebc..6634628 100644
--- a/gettext-runtime/po/sk.po
+++ b/gettext-runtime/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-23 20:24+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -92,7 +92,7 @@ msgstr "%s: voľba '-W %s' vyžaduje parameter\n"
 msgid "memory exhausted"
 msgstr "pamäť je vy�erpaná"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -105,7 +105,7 @@ msgstr ""
 "Toto je voľne šíriteľný softvér: môžete ho voľne meniť a �alej šíriť.\n"
 "Neposkytuje sa ŽIADNA Z�RUKA, v rozsahu povolenom zákonmi.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
@@ -115,17 +115,17 @@ msgstr "Napísal %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "príliš veľa parametrov"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "chýbajúce parametre"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Skúste '%s --help' a dozviete sa viac informácií.\n"
@@ -195,7 +195,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Správy o chybách zasielajte na adresu <bug-gnu-gettext@gnu.org> (iba "
@@ -213,7 +213,7 @@ msgid "standard input"
 msgstr "štandardný vstup"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -273,12 +273,12 @@ msgstr ""
 "ktoré sa nachádzajú vo vybranom katalógu správ budú preložené.\n"
 "Štandardný adresár, v ktorom sa budú hľadať katalógy: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Použitie: %s [VOĽBA] [DOMÉNA] ID_SPR�VY ID_SPR�VY-MNČ POČET\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -287,7 +287,7 @@ msgstr ""
 "Zobraziť preklad textovej správy, ktorej gramatický tvar závisí od �ísla,\n"
 "do natívneho jazyka.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -310,7 +310,7 @@ msgstr ""
 "                            (množné �íslo)\n"
 "  POČET                     vybrať jednotné/množné �íslo na základe tejto hodnoty\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/sl.gmo b/gettext-runtime/po/sl.gmo
index 09ac418..d123b79 100644
--- a/gettext-runtime/po/sl.gmo
+++ b/gettext-runtime/po/sl.gmo
diff --git a/gettext-runtime/po/sl.po b/gettext-runtime/po/sl.po
index 232023c..3fd1a37 100644
--- a/gettext-runtime/po/sl.po
+++ b/gettext-runtime/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-28 10:38+0200\n"
 "Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -94,7 +94,7 @@ msgstr "%s: izbira '-W %s' zahteva argument\n"
 msgid "memory exhausted"
 msgstr "zmanjkalo pomnilnika"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -107,7 +107,7 @@ msgstr ""
 "To je prost program; smete ga spreminjati in deliti z drugimi.\n"
 "Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor %s.\n"
@@ -117,17 +117,17 @@ msgstr "Avtor %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "preve� argumentov"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "argumenti manjkajo"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za iz�rpnejša navodila\n"
@@ -196,7 +196,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Morebitne napake v programu sporo�ite na <bug-gnu-gettext@gnu.org>.\n"
 
@@ -210,7 +210,7 @@ msgid "standard input"
 msgstr "standardni vhod"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -268,12 +268,12 @@ msgstr ""
 "kataloga sporo�il.\n"
 "Privzet imenik s katalogom sporo�il: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Uporaba: %s [IZBIRA] [DOMENA] MSGID MSGID-PLURAL Å TEVEC\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -282,7 +282,7 @@ msgstr ""
 "Prikaz prevoda besedilnega sporo�ila, katerega slovni�na oblika je odvisna\n"
 "od Å¡tevila.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -303,7 +303,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        prevod MSGID (ednina) ali MSGID_PLURAL (množina)\n"
 "  ŠTEVEC                    dolo�itev edninske/množinske oblike\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/sr.gmo b/gettext-runtime/po/sr.gmo
index 091f15b..4386261 100644
--- a/gettext-runtime/po/sr.gmo
+++ b/gettext-runtime/po/sr.gmo
diff --git a/gettext-runtime/po/sr.po b/gettext-runtime/po/sr.po
index a0ce9a0..b0b0927 100644
--- a/gettext-runtime/po/sr.po
+++ b/gettext-runtime/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-12-23 19:25+0200\n"
 "Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -92,7 +92,7 @@ msgstr "%s: опција „-W %s“ захтева аргумент\n"
 msgid "memory exhausted"
 msgstr "меморија је потрошена"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -105,7 +105,7 @@ msgstr ""
 "Ово је �лободан �офтвер: �лободни �те да га мењате и ра�подељујете.\n"
 "�е по�тоји �ИК�КВ� Г�Р��ЦИЈ�, у оквирима дозвољеним законом.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�апи�ао је %s.\n"
@@ -115,17 +115,17 @@ msgstr "�апи�ао је %s.\n"
 msgid "Bruno Haible"
 msgstr "Бруно Хејбл"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "превише аргумената"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "недо�тају аргументи"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Пробајте „%s --help“ за више података.\n"
@@ -194,7 +194,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Грешке пријавите на <bug-gnu-gettext@gnu.org>.\n"
 
@@ -208,7 +208,7 @@ msgid "standard input"
 msgstr "�тандардни улаз"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
@@ -268,12 +268,12 @@ msgstr ""
 "које по�тоје у изабраном каталогу �е преводе.\n"
 "Уобичајени директоријум за тражење је: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Употреба: %s [ОПЦИЈ�] [ДОМЕ�ТЕКСТ�] МСГИД БРОЈ МСГИД-М�ОЖИ��\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -282,7 +282,7 @@ msgstr ""
 "Приказује превод на матерњем језику за тек�туалну поруку чији \n"
 "облик зави�и од броја.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -304,7 +304,7 @@ msgstr ""
 "  МСГИД МСГИД-М�ОЖИ��       преводи облик једнине/множине\n"
 "  БРОЈ                      бира облик једнине/множине према овој вредно�ти\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/sv.gmo b/gettext-runtime/po/sv.gmo
index 1c50df7..aa8b646 100644
--- a/gettext-runtime/po/sv.gmo
+++ b/gettext-runtime/po/sv.gmo
diff --git a/gettext-runtime/po/sv.po b/gettext-runtime/po/sv.po
index ad4aec6..ee428fc 100644
--- a/gettext-runtime/po/sv.po
+++ b/gettext-runtime/po/sv.po
@@ -1,15 +1,18 @@
 # Swedish messages for gettext
-# Copyright © 1996, 1997, 1998, 2001, 2002, 2003, 2007, 2010, 2013 Free Software Foundation, Inc.
+# Copyright © 1996, 1997, 1998, 2001, 2002, 2003, 2007, 2010, 2013, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 1998, 2001, 2002, 2003, 2006, 2007, 2010, 2013
+# Göran Uddeborg <goeran@uddeborg.se>, 2016.
 #
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2013-03-10 16:05+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-05-26 22:53+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -28,70 +31,70 @@ msgstr "Okänt systemfel"
 #: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:604
 #, c-format
 msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flaggan \"%s\" är tvetydig; alternativ:"
+msgstr "%s: flaggan �%s� är tvetydig; alternativ:"
 
 #: gnulib-lib/getopt.c:619
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
+msgstr "%s: flaggan �%s� är tvetydig\n"
 
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"--%s\" tar inget argument\n"
+msgstr "%s: flaggan �--%s� tar inget argument\n"
 
 #: gnulib-lib/getopt.c:667 gnulib-lib/getopt.c:672
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
+msgstr "%s: flaggan �%c%s� tar inget argument\n"
 
 #: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flaggan \"%s\" kräver ett argument\n"
+msgstr "%s: flaggan �%s� kräver ett argument\n"
 
 #: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
+msgstr "%s: okänd flagga �--%s�\n"
 
 #: gnulib-lib/getopt.c:783 gnulib-lib/getopt.c:786
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: okänd flagga \"%c%s\"\n"
+msgstr "%s: okänd flagga �%c%s�\n"
 
 #: gnulib-lib/getopt.c:835 gnulib-lib/getopt.c:838
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ogiltig flagga -- \"%c\"\n"
+msgstr "%s: ogiltig flagga -- �%c�\n"
 
 #: gnulib-lib/getopt.c:891 gnulib-lib/getopt.c:908 gnulib-lib/getopt.c:1118
 #: gnulib-lib/getopt.c:1136
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: flaggan kräver ett argument -- \"%c\"\n"
+msgstr "%s: flaggan kräver ett argument -- �%c�\n"
 
 #: gnulib-lib/getopt.c:964 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
+msgstr "%s: flaggan �-W %s� är tvetydig\n"
 
 #: gnulib-lib/getopt.c:1004 gnulib-lib/getopt.c:1022
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
+msgstr "%s: flaggan �-W %s� tar inget argument\n"
 
 #: gnulib-lib/getopt.c:1043 gnulib-lib/getopt.c:1061
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flaggan \"-W %s\" kräver ett argument\n"
+msgstr "%s: flaggan �-W %s� kräver ett argument\n"
 
 #: gnulib-lib/xmalloc.c:38
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -104,7 +107,7 @@ msgstr ""
 "Detta program är fri programvara.  Du kan modifiera och distribuera den.\n"
 "Det finns inte NÅGON SOM HELST GARANTI, till den grad som lagen tillåter.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrivet av %s.\n"
@@ -114,20 +117,20 @@ msgstr "Skrivet av %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "för många argument"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "argument saknas"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "Försök med \"%s --help\" för mer information.\n"
+msgstr "Försök med �%s --help� för mer information.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
@@ -193,7 +196,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <bug-gnu-gettext@gnu.org>.\n"
@@ -203,14 +206,14 @@ msgstr ""
 #: src/envsubst.c:442
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "fel uppstod då \"%s\" lästes"
+msgstr "fel uppstod då �%s� lästes"
 
 #: src/envsubst.c:443
 msgid "standard input"
 msgstr "standard in"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -244,7 +247,7 @@ msgstr ""
 "  -e                        expandera några kontrollsekvenser\n"
 "  -E                        (ignorerad för bakåtkompatibilitet)\n"
 "  -h, --help                visa denna hjälptext och avsluta\n"
-"  -n                        skriv inte ut avslutande radframmatning\n"
+"  -n                        skriv inte ut avslutande nyrad\n"
 "  -V, --version             visa versionsinformation och avsluta\n"
 "  [TEXTDOMÄN] MSGID         hämta översatt meddelande som motsvarar\n"
 "                            MSGID från TEXTDOMÄN\n"
@@ -264,17 +267,17 @@ msgstr ""
 "Om parametern TEXTDOMÄN utelämnas bestäms domänen av miljövariabeln\n"
 "TEXTDOMAIN. Om meddelandekatalogen inte hittas i den normala katalogen så\n"
 "kan en annan katalog anges med miljövariabeln TEXTDOMAINDIR.\n"
-"När flaggan -s ges uppträder programmet som kommandot \"echo\".\n"
+"När flaggan -s ges uppträder programmet som kommandot �echo�.\n"
 "Men det kopierar inte enbart sina argument till standard ut. Istället\n"
 "översätts de argument som hittas i den valda meddelandekatalogen.\n"
 "Normal katalog för meddelandekataloger: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Användning: %s [FLAGGA] [TEXTDOMÄN] MSGID MSGID-PLURAL ANTAL\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -283,7 +286,7 @@ msgstr ""
 "Visa översättningar i det lokala språket av textmeddelanden vars grammatiska\n"
 "form beror på ett tal.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -304,7 +307,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        översätt MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  ANTAL                     välj singular/plural baserat på detta värde\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/tr.gmo b/gettext-runtime/po/tr.gmo
index 75f3037..1f77fbf 100644
--- a/gettext-runtime/po/tr.gmo
+++ b/gettext-runtime/po/tr.gmo
diff --git a/gettext-runtime/po/tr.po b/gettext-runtime/po/tr.po
index 1e62edb..7957717 100644
--- a/gettext-runtime/po/tr.po
+++ b/gettext-runtime/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-02-15 20:19+0100\n"
 "Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -93,7 +93,7 @@ msgstr "%s: '-W %s' seçeneği bağımsız bir değişken gerektiriyor\n"
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -106,7 +106,7 @@ msgstr ""
 "Bu özgür yazılımdır: değiştirip dağıtma özgürlüğüne sahipsiniz.\n"
 "Yasaların elverdiği ölçüde HİÇBİR GARANTİ yoktur.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s tarafından yazıldı.\n"
@@ -116,17 +116,17 @@ msgstr "%s tarafından yazıldı.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "argümanlar eksik"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için '%s --help' deneyin.\n"
@@ -197,7 +197,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine,\n"
@@ -213,7 +213,7 @@ msgid "standard input"
 msgstr "standart girdi"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -271,19 +271,19 @@ msgstr ""
 "bulunan mesajlar çevrilir.\n"
 "Standart arama dizini: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Kullanımı: %s [SEÇENEK] [PAKET] MSGID MSGID-PLURAL SAYI\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "Bir sayıya bağlı olarak ilgili tekil/çoğul ileti çevirisini gösterir.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -304,7 +304,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL   MSGID (tekil) / MSGID-PLURAL (çoğul) çevrilir\n"
 "  SAYI               SAYIya bağlı olarak tekil/çoğul iletilerden biri seçilir\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/uk.gmo b/gettext-runtime/po/uk.gmo
index 0d500f2..887e8cd 100644
--- a/gettext-runtime/po/uk.gmo
+++ b/gettext-runtime/po/uk.gmo
diff --git a/gettext-runtime/po/uk.po b/gettext-runtime/po/uk.po
index 5a36e98..5819a57 100644
--- a/gettext-runtime/po/uk.po
+++ b/gettext-runtime/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-23 20:47+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -93,7 +93,7 @@ msgstr "%s: до параметра «-W %s» �лід додати аргуме
 msgid "memory exhausted"
 msgstr "пам'�ть вичерпано"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -106,7 +106,7 @@ msgstr ""
 "Це вільне програмне забезпеченн�: ви можете вільно змінювати і поширювати його.\n"
 "Вам не надаєть�� ЖОД�ИХ Г�Р��ТІЙ, окрім гарантій передбачених законодав�твом.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�втор програми - %s.\n"
@@ -116,17 +116,17 @@ msgstr "�втор програми - %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "надто багато аргументів"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "від�утні аргументи"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Віддайте команду «%s --help», щоб дізнати�� більше.\n"
@@ -196,7 +196,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Про помилки повідомл�йте на <bug-gnu-gettext@gnu.org>.\n"
 
@@ -210,7 +210,7 @@ msgid "standard input"
 msgstr "�тандартний ввід"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -270,12 +270,12 @@ msgstr ""
 "вивод�ть�� їх переклади з вказаного домену.\n"
 "Стандартний каталог пошуку: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Викори�танн�: %s [П�Р�МЕТР] [ДОМЕ�_ТЕКСТУ] MSGID MSGID-PLURAL ЧИСЛО\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -284,7 +284,7 @@ msgstr ""
 "Відображає переклад тек�тового повідомленн�, граматична форма �кого залежить\n"
 "від чи�ла.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -306,7 +306,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        перекла�ти MSGID (однина) / MSGID-PLURAL (множина)\n"
 "  ЧИСЛО                     вибрати однину/множину на о�нові цього значенн�\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/vi.gmo b/gettext-runtime/po/vi.gmo
index e39e3e4..0fcc17f 100644
--- a/gettext-runtime/po/vi.gmo
+++ b/gettext-runtime/po/vi.gmo
diff --git a/gettext-runtime/po/vi.po b/gettext-runtime/po/vi.po
index 0937b89..8a76326 100644
--- a/gettext-runtime/po/vi.po
+++ b/gettext-runtime/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-30 08:06+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -95,7 +95,7 @@ msgstr "%s: tùy ch�n “-W %s� yêu cầu một đối số\n"
 msgid "memory exhausted"
 msgstr "hết bộ nhớ"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -108,7 +108,7 @@ msgstr ""
 "�ây là phần m�m tự do: bạn có quy�n thay đổi và phát hành lại nó.\n"
 "KHÔNG CÓ BẢO HÀNH GÌ CẢ, với đi�u kiện được pháp luật cho phép.\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Viết bởi %s.\n"
@@ -119,17 +119,17 @@ msgstr "Viết bởi %s.\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "quá nhi�u đối số"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "đối số còn thiếu"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Hãy thử lệnh “%s --help� để xem thông tin thêm.\n"
@@ -200,7 +200,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Hãy thông báo lỗi nào cho <bug-gnu-gettext@gnu.org>.\n"
@@ -218,7 +218,7 @@ msgstr "đầu vào tiêu chuẩn"
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -280,12 +280,12 @@ msgstr ""
 "bằng bản dịch tương ứng.\n"
 "Thư mục thư�ng dùng để quét tìm các bản dịch: %s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] [MIỀN_VĂN_BẢN] MSGID MSGID-NHIỀU S�_LƯỢNG\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -294,7 +294,7 @@ msgstr ""
 "Hiển thị bản dịch ngôn ngữ mẹ đẻ của chuỗi thuộc văn bản có dạng\n"
 "ngữ pháp phụ thuộc vào con số.\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -315,7 +315,7 @@ msgstr ""
 "  MSGID MSGID-NHIỀU         dịch MSGID (số ít) / MSGID-NHIỀU (số nhi�u)\n"
 "  S�_�ẾM                    ch�n dạng số ít/số nhi�u dựa vào giá trị này\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/zh_CN.gmo b/gettext-runtime/po/zh_CN.gmo
index 0c51019..3ff4a51 100644
--- a/gettext-runtime/po/zh_CN.gmo
+++ b/gettext-runtime/po/zh_CN.gmo
diff --git a/gettext-runtime/po/zh_CN.po b/gettext-runtime/po/zh_CN.po
index da4e2b1..383021c 100644
--- a/gettext-runtime/po/zh_CN.po
+++ b/gettext-runtime/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-09-01 10:02中国标准时间\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -97,7 +97,7 @@ msgstr "%s：选项“%s�需�一个�数\n"
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -110,7 +110,7 @@ msgstr ""
 "这是自由软件: 你有修改和��布的自由。\n"
 "本软件在法律�许的范围内��供任何担�。\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 编写。\n"
@@ -120,17 +120,17 @@ msgstr "由 %s 编写。\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "�数过多"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "缺少了�数"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "试试“%s --help��获�更多信�。\n"
@@ -197,7 +197,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 
@@ -211,7 +211,7 @@ msgid "standard input"
 msgstr "标准输入"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -268,19 +268,19 @@ msgstr ""
 "输出，而是寻找消�一览表文件里翻译过的消�。\n"
 "标准的�索目录为：%s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "用法：%s [选项] [文本域] MSGID �数-MSGID 数字\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "显示�原文消�的本地语言翻译，而翻译的语法和数字有关。\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -301,7 +301,7 @@ msgstr ""
 "  MSGID �数-MSGID          翻译 MSGID (�数) / �数-MSGID (�数)\n"
 "  数字                      根�<数字>�选择�数或�数型�\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/zh_HK.gmo b/gettext-runtime/po/zh_HK.gmo
index 444c520..6357551 100644
--- a/gettext-runtime/po/zh_HK.gmo
+++ b/gettext-runtime/po/zh_HK.gmo
diff --git a/gettext-runtime/po/zh_HK.po b/gettext-runtime/po/zh_HK.po
index 3bbd45c..3176dd0 100644
--- a/gettext-runtime/po/zh_HK.po
+++ b/gettext-runtime/po/zh_HK.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2006-07-05 17:16+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -94,7 +94,7 @@ msgstr "%s：�項「%s�需��數\n"
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -103,7 +103,7 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
@@ -113,17 +113,17 @@ msgstr "由 %s 編寫。\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "�數�多"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "缺少了�數"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "如果想���外資訊，請嘗試執行「%s --help�。\n"
@@ -190,7 +190,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "請� <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 
@@ -204,7 +204,7 @@ msgid "standard input"
 msgstr "標準輸入"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -261,19 +261,19 @@ msgstr ""
 "而是尋找訊�資料檔�翻譯�的訊�。\n"
 "標準的�尋目錄為：%s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "用法：%s [�項] [文字領域] MSGID 複數MSGID 數字\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "顯示�文字訊�的本地語言翻譯，而翻譯的文法�單數複數影響。\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -294,7 +294,7 @@ msgstr ""
 "  MSGID 複數MSGID           翻譯 MSGID (單數) / 複數MSGID (複數)\n"
 "  數字                      根據<數字>來�擇單數或複數型態\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/po/zh_TW.gmo b/gettext-runtime/po/zh_TW.gmo
index 5d5c6dd..a70ea7a 100644
--- a/gettext-runtime/po/zh_TW.gmo
+++ b/gettext-runtime/po/zh_TW.gmo
diff --git a/gettext-runtime/po/zh_TW.po b/gettext-runtime/po/zh_TW.po
index 9d365c3..ebdefee 100644
--- a/gettext-runtime/po/zh_TW.po
+++ b/gettext-runtime/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-10-08 13:00+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -94,7 +94,7 @@ msgstr "%s：�項 -W %s 需�一個引數\n"
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:124
+#: src/envsubst.c:112 src/gettext.c:134 src/ngettext.c:123
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -107,7 +107,7 @@ msgstr ""
 "這是自由軟體；請�考原始碼的著作權�明。本軟體��供任何�證，甚至�會包括\n"
 "�售性和�用於任何特定目的的�證。\n"
 
-#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
@@ -117,17 +117,17 @@ msgstr "由 %s 編寫。\n"
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
 msgstr "引數�多"
 
-#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
 msgstr "缺少引數"
 
-#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:207
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "如果想���外資訊，請嘗試執行 %s --help。\n"
@@ -194,7 +194,7 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:246
+#: src/envsubst.c:219 src/gettext.c:280 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "請� <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 
@@ -208,7 +208,7 @@ msgid "standard input"
 msgstr "標準輸入"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:140 src/ngettext.c:130
+#: src/gettext.c:140 src/ngettext.c:129
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -265,19 +265,19 @@ msgstr ""
 "而是尋找訊�資料檔裡翻譯�的訊�。\n"
 "標準的�尋目錄為：%s\n"
 
-#: src/ngettext.c:213
+#: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "用法：%s [�項] [文字領域] MSGID 複數MSGID 數�\n"
 
-#: src/ngettext.c:218
+#: src/ngettext.c:217
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr "顯示�文字訊�的本地語言翻譯，而翻譯的文法�單數複數影響。\n"
 
-#: src/ngettext.c:223
+#: src/ngettext.c:222
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -298,7 +298,7 @@ msgstr ""
 "  MSGID 複數MSGID           翻譯 MSGID (單數) / 複數MSGID (複數)\n"
 "  數�                      根據 <數�> 來�擇單數或複數型態\n"
 
-#: src/ngettext.c:234
+#: src/ngettext.c:233
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am
index 147c8e7..bf765a5 100644
--- a/gettext-runtime/src/Makefile.am
+++ b/gettext-runtime/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/src subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2007, 2009, 2015 Free Software
+## Copyright (C) 1995-1998, 2000-2007, 2009, 2015-2016 Free Software
 ## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/src/Makefile.in b/gettext-runtime/src/Makefile.in
index 37999b2..7401555 100644
--- a/gettext-runtime/src/Makefile.in
+++ b/gettext-runtime/src/Makefile.in
@@ -112,6 +112,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c
index 0b00909..c166d5a 100644
--- a/gettext-runtime/src/envsubst.c
+++ b/gettext-runtime/src/envsubst.c
@@ -1,5 +1,5 @@
 /* Substitution of environment variables in shell format strings.
-   Copyright (C) 2003-2007, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2012, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-runtime/src/gettext.c b/gettext-runtime/src/gettext.c
index 7560d9e..a7d8c0c 100644
--- a/gettext-runtime/src/gettext.c
+++ b/gettext-runtime/src/gettext.c
@@ -1,5 +1,5 @@
 /* gettext - retrieve text string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2007, 2012, 2015 Free Software
+   Copyright (C) 1995-1997, 2000-2007, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995.
 
diff --git a/gettext-runtime/src/gettext.sh.in b/gettext-runtime/src/gettext.sh.in
index 1dfa3bb..9ea25ca 100644
--- a/gettext-runtime/src/gettext.sh.in
+++ b/gettext-runtime/src/gettext.sh.in
@@ -1,7 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2003, 2005-2007, 2011, 2015 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2005-2007, 2011, 2015-2016 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-runtime/src/ngettext.c b/gettext-runtime/src/ngettext.c
index dd01a35..668f3d2 100644
--- a/gettext-runtime/src/ngettext.c
+++ b/gettext-runtime/src/ngettext.c
@@ -1,6 +1,5 @@
 /* ngettext - retrieve plural form string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2007, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1997, 2000-2007, 2015-2016 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
diff --git a/gettext-runtime/tests/Makefile.am b/gettext-runtime/tests/Makefile.am
index 0085994..88a0684 100644
--- a/gettext-runtime/tests/Makefile.am
+++ b/gettext-runtime/tests/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gettext-runtime/tests subdirectory of GNU gettext
-## Copyright (C) 2005-2006, 2008-2009, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 2005-2006, 2008-2009, 2015-2016 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
diff --git a/gettext-runtime/tests/Makefile.in b/gettext-runtime/tests/Makefile.in
index cfcf9df..4327733 100644
--- a/gettext-runtime/tests/Makefile.in
+++ b/gettext-runtime/tests/Makefile.in
@@ -110,6 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-runtime/tests/test-lock.c b/gettext-runtime/tests/test-lock.c
index ec5695c..d279d1d 100644
--- a/gettext-runtime/tests/test-lock.c
+++ b/gettext-runtime/tests/test-lock.c
@@ -1,5 +1,5 @@
 /* Test of locking in multithreaded situations.
-   Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gettext-tools/ABOUT-NLS b/gettext-tools/ABOUT-NLS
index 1551426..3cc8286 100644
--- a/gettext-tools/ABOUT-NLS
+++ b/gettext-tools/ABOUT-NLS
@@ -205,7 +205,7 @@ translation percentage of at least 50%.
      grub               |                                         []        |
      gsasl              |                                                   |
      gss                |                                                   |
-     gst-plugins-bad    |                                                [] |
+     gst-plugins-bad    |                          []                    [] |
      gst-plugins-base   |                          []             []     [] |
      gst-plugins-good   |                          []             []     [] |
      gst-plugins-ugly   |                          []             []     [] |
@@ -231,7 +231,6 @@ translation percentage of at least 50%.
      jwhois             |                                                   |
      kbd                |                                                [] |
      klavaro            |          []              [] []          []     [] |
-     latrine            |                                                   |
      ld                 |                          []                       |
      leafpad            |                       [] []             []     [] |
      libc               |                          []             []     [] |
@@ -262,6 +261,7 @@ translation percentage of at least 50%.
      opcodes            |                                                   |
      parted             |                                                [] |
      pies               |                                                   |
+     pnmixer            |                                                   |
      popt               |                                                [] |
      procps-ng          |                                                   |
      procps-ng-man      |                                                   |
@@ -276,11 +276,11 @@ translation percentage of at least 50%.
      rpm                |                                                   |
      rush               |                                                   |
      sarg               |                                                   |
-     sed                |                []                       []     [] |
+     sed                |                []        []             []     [] |
      sharutils          |                                                [] |
      shishi             |                                                   |
      skribilo           |                                                   |
-     solfege            |                                                [] |
+     solfege            |                                         []     [] |
      solfege-manual     |                                                   |
      spotmachine        |                                                   |
      sudo               |                                         []     [] |
@@ -288,7 +288,7 @@ translation percentage of at least 50%.
      sysstat            |                                                [] |
      tar                |                          []             []     [] |
      texinfo            |                                         []     [] |
-     texinfo_document   |                                         []        |
+     texinfo_document   |                                         []     [] |
      tigervnc           |                          []                       |
      tin                |                                                   |
      tin-man            |                                                   |
@@ -310,9 +310,9 @@ translation percentage of at least 50%.
      xkeyboard-config   |                          []             []     [] |
                         +---------------------------------------------------+
                           af am an ar as ast az be bg bn bn_IN bs ca crh cs
-                           4  0  2  5  3 11   0  8 23  3   3    1 54  4  73
+                           4  0  2  5  3 11   0  8 25  3   3    1 55  4  74
 
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr
+                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
                         +--------------------------------------------------+
      a2ps               | []  []  []     []         [] [] []       []  []  |
      aegis              | []  []                       []              []  |
@@ -324,7 +324,7 @@ translation percentage of at least 50%.
      bison              | []  []  []                [] [] []       []  []  |
      bison-runtime      | []  []  []                [] [] []       []  []  |
      buzztrax           | []  []                                   []  []  |
-     ccd2cue            | []  []                                       []  |
+     ccd2cue            | []  []                    []                 []  |
      ccide              | []  []                    [] []          []  []  |
      cflow              | []  []                    []             []  []  |
      clisp              | []  []     []                []              []  |
@@ -355,7 +355,7 @@ translation percentage of at least 50%.
      gas                |                              []          []  []  |
      gawk               | []  []                       []          []  []  |
      gcal               | []  []                       []              []  |
-     gcc                |     []                       []                  |
+     gcc                |     []                                           |
      gdbm               | []  []                    []             []  []  |
      gettext-examples   | []  []  []                [] []          []  []  |
      gettext-runtime    | []  []                    [] []          []  []  |
@@ -377,7 +377,7 @@ translation percentage of at least 50%.
      grub               | []  []                       []          []  []  |
      gsasl              | []  []                    []             []  []  |
      gss                | []  []                    []             []  []  |
-     gst-plugins-bad    | []  []                                           |
+     gst-plugins-bad    | []  []                                       []  |
      gst-plugins-base   | []  []  []                   []          []  []  |
      gst-plugins-good   | []  []  []                   []    []    []  []  |
      gst-plugins-ugly   | []  []  []                [] []    []    []  []  |
@@ -403,7 +403,6 @@ translation percentage of at least 50%.
      jwhois             |     []                    [] []          []  []  |
      kbd                | []  []  []                [] []              []  |
      klavaro            | []  []  []                [] []    []        []  |
-     latrine            | []  ()                    []             []      |
      ld                 | []                           []          []  []  |
      leafpad            | []  []  []                [] []    []    []  []  |
      libc               | []  []                       []          []  []  |
@@ -434,6 +433,7 @@ translation percentage of at least 50%.
      opcodes            | []  []                       []          []  []  |
      parted             | []  []                                       []  |
      pies               |     []                                           |
+     pnmixer            |     []                                       []  |
      popt               | []  []                    [] []          []  []  |
      procps-ng          |     []                                       []  |
      procps-ng-man      |     []                                       []  |
@@ -451,10 +451,10 @@ translation percentage of at least 50%.
      sed                | []  []  []                [] [] []       []  []  |
      sharutils          |     []                    []    []           []  |
      shishi             |     []                                   []  []  |
-     skribilo           | []                                           []  |
+     skribilo           | []                           []              []  |
      solfege            | []  []                    [] [] []    [] []  []  |
      solfege-manual     |     []                    [] [] []           []  |
-     spotmachine        | []  []                    []             []      |
+     spotmachine        | []  []                    []             []  []  |
      sudo               | []  []                    [] []          []  []  |
      sudoers            | []  []  []                []             []  []  |
      sysstat            | []  []                    [] []          []  []  |
@@ -471,7 +471,7 @@ translation percentage of at least 50%.
      vice               | ()  ()                                       ()  |
      vmm                |     []                                   []      |
      vorbis-tools       | []  []                    []                 []  |
-     wastesedge         | []                                           ()  |
+     wastesedge         | []                                               |
      wcd                |     []                    [] []          []      |
      wcd-man            |     []                                           |
      wdiff              | []  []                    [] [] []       []  []  |
@@ -481,8 +481,8 @@ translation percentage of at least 50%.
      xdg-user-dirs      | []  []  []                [] [] [] [] [] []  []  |
      xkeyboard-config   | []  []  []                [] []          []  []  |
                         +--------------------------------------------------+
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr
-                          120 130 32  1   6     0   94 95 22 13  4 103 136
+                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
+                          119 131 32  1   6     0   94 95 22 13  4 102 139
 
                           ga gd gl gu he hi hr hu hy ia id is it ja ka kk
                         +-------------------------------------------------+
@@ -490,7 +490,7 @@ translation percentage of at least 50%.
      aegis              |                                     []          |
      anubis             |                   [] []       []    []          |
      aspell             | []                []          []    [] []       |
-     bash               |                               []    [] []       |
+     bash               |                      []       []    [] []       |
      bfd                |                               []       []       |
      binutils           |                               []    [] []       |
      bison              |                   []                            |
@@ -500,7 +500,7 @@ translation percentage of at least 50%.
      ccide              |                   [] []                         |
      cflow              | []                []          []                |
      clisp              |                                                 |
-     coreutils          |                      []             [] []       |
+     coreutils          |                      []                []       |
      cpio               | []                [] []       []    [] []       |
      cppi               |       []          [] []             [] []       |
      cpplib             |                               []       []       |
@@ -516,7 +516,7 @@ translation percentage of at least 50%.
      doodle             | []                                  []          |
      dos2unix           |                      []                []       |
      dos2unix-man       |                                                 |
-     e2fsprogs          |                               []                |
+     e2fsprogs          |                      []       []                |
      enscript           | []                []          []                |
      exif               |       []          []          [] [] [] []       |
      fetchmail          |                               []    [] []       |
@@ -536,7 +536,7 @@ translation percentage of at least 50%.
      glunarclock        | []    []          [] []       []    []          |
      gnubiff            |                      []       []    ()          |
      gnubik             |       []          []                []          |
-     gnucash            |          () () ()    ()             () []       |
+     gnucash            |          () () ()    ()             ()          |
      gnuchess           |                                                 |
      gnulib             | []    []             []             [] []       |
      gnunet             |                                                 |
@@ -549,7 +549,7 @@ translation percentage of at least 50%.
      grub               |       []             []             []          |
      gsasl              | []                [] []       []    []          |
      gss                | []                [] []       []    []          |
-     gst-plugins-bad    |                      []                         |
+     gst-plugins-bad    |                   [] []       []                |
      gst-plugins-base   |       []          [] []       []                |
      gst-plugins-good   |       []          [] []       []    [] []       |
      gst-plugins-ugly   |       []          [] []       []    [] []       |
@@ -575,7 +575,6 @@ translation percentage of at least 50%.
      jwhois             |       []             []       []    []          |
      kbd                |                      []       []    []          |
      klavaro            |       []          [] []             []       [] |
-     latrine            |                      []                         |
      ld                 | []                            []    [] []       |
      leafpad            | []    []    []    [] []       []    [] ()       |
      libc               |       []          []          []    [] []       |
@@ -602,10 +601,11 @@ translation percentage of at least 50%.
      minicom            |                      []       []       []       |
      mkisofs            |                               []    []          |
      myserver           |                                     []          |
-     nano               | []    []             []             [] []       |
+     nano               | []    []          [] []             [] []       |
      opcodes            | []                            []    []          |
-     parted             |       []                      []    [] []       |
+     parted             |       []             []       []    [] []       |
      pies               |                                                 |
+     pnmixer            |                   []                []          |
      popt               | []    [] []       [] []    [] [] [] [] []       |
      procps-ng          |                                                 |
      procps-ng-man      |                                                 |
@@ -629,10 +629,10 @@ translation percentage of at least 50%.
      spotmachine        |                                                 |
      sudo               |       []          []                [] []       |
      sudoers            |                   []                [] []       |
-     sysstat            |                      []       []       []       |
+     sysstat            |                   [] []       []       []       |
      tar                | []                [] []       []    [] []       |
      texinfo            |                   []          []    []          |
-     texinfo_document   |                      []             []          |
+     texinfo_document   |                   [] []             []          |
      tigervnc           |                                                 |
      tin                |                                                 |
      tin-man            |                                                 |
@@ -643,20 +643,20 @@ translation percentage of at least 50%.
      vice               |                      ()             ()          |
      vmm                |                                                 |
      vorbis-tools       |                   []          []                |
-     wastesedge         |                                     ()          |
+     wastesedge         |                                     []          |
      wcd                |                                                 |
      wcd-man            |                                                 |
      wdiff              |       []             []             []          |
-     wget               |                      []             [] []       |
+     wget               |                   [] []             [] []       |
      wyslij-po          |       []          []          []                |
      xboard             |                                                 |
      xdg-user-dirs      | [] [] [] [] [] [] [] []    [] [] [] [] []    [] |
-     xkeyboard-config   |       []             []       []    [] []       |
+     xkeyboard-config   |       []          [] []       []    [] []       |
                         +-------------------------------------------------+
                           ga gd gl gu he hi hr hu hy ia id is it ja ka kk
-                          35  2 47  4  8  2 53 69  2  6 80 11 86 58  0  3
+                          35  2 47  4  8  2 60 71  2  6 81 11 87 57  0  3
 
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
+                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
                         +--------------------------------------------------+
      a2ps               |                                  []          []  |
      aegis              |                                              []  |
@@ -690,7 +690,7 @@ translation percentage of at least 50%.
      dos2unix-man       |                                              []  |
      e2fsprogs          |                                              []  |
      enscript           |                                              []  |
-     exif               |                   []                         []  |
+     exif               |    []             []                         []  |
      fetchmail          |                                              []  |
      findutils          |                                        []    []  |
      flex               |                                              []  |
@@ -702,7 +702,7 @@ translation percentage of at least 50%.
      gcc                |                                                  |
      gdbm               |                                                  |
      gettext-examples   |          []       []             [] [] []    []  |
-     gettext-runtime    |    []                                        []  |
+     gettext-runtime    |    []                                  []    []  |
      gettext-tools      |    []                                            |
      gjay               |                                                  |
      glunarclock        |                   []                         []  |
@@ -721,11 +721,11 @@ translation percentage of at least 50%.
      grub               |                []                      []    []  |
      gsasl              |                                              []  |
      gss                |                                                  |
-     gst-plugins-bad    |                                        []    []  |
+     gst-plugins-bad    |                   []                   []    []  |
      gst-plugins-base   |                   []                   []    []  |
      gst-plugins-good   |                [] []                   []    []  |
      gst-plugins-ugly   |                   []             [] [] []    []  |
-     gstreamer          |                []                            []  |
+     gstreamer          |                []                      []    []  |
      gtick              |                                              []  |
      gtkam              |                                        []    []  |
      gtkspell           |          []    [] []       []    []    []    []  |
@@ -747,7 +747,6 @@ translation percentage of at least 50%.
      jwhois             |                   []                         []  |
      kbd                |                                              []  |
      klavaro            |                                        []    []  |
-     latrine            |                                                  |
      ld                 |                                                  |
      leafpad            |    []    []    [] []                         []  |
      libc               |    []                                        []  |
@@ -776,8 +775,9 @@ translation percentage of at least 50%.
      myserver           |                                                  |
      nano               |                                  []    []    []  |
      opcodes            |                                              []  |
-     parted             |                                              []  |
+     parted             |    []                                        []  |
      pies               |                                                  |
+     pnmixer            |                                              []  |
      popt               | [] []             []                   []    []  |
      procps-ng          |                                                  |
      procps-ng-man      |                                                  |
@@ -799,8 +799,8 @@ translation percentage of at least 50%.
      solfege            |                                        []    []  |
      solfege-manual     |                                              []  |
      spotmachine        |                                              []  |
-     sudo               |                                        []    []  |
-     sudoers            |                                        []    []  |
+     sudo               |    []                                  []    []  |
+     sudoers            |    []                                  []    []  |
      sysstat            |                                        []    []  |
      tar                |          []                            []    []  |
      texinfo            |                                              []  |
@@ -825,524 +825,524 @@ translation percentage of at least 50%.
      xdg-user-dirs      | [] [] [] []    [] [] [] []    []       []    []  |
      xkeyboard-config   |    []          []                            []  |
                         +--------------------------------------------------+
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl
-                           5 11  4  6  0 13 22  3  3  3  4 11  2 40  1 124
+                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
+                           5 15  4  6  0 13 23  3  3  3  4 11  2 42  1 125
 
-                          nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-                        +--------------------------------------------------+
-     a2ps               |             []     []  []   [] []       []    [] |
-     aegis              |                        []      []                |
-     anubis             |             []                 []             [] |
-     aspell             |             []         []   [] []    [] []    [] |
-     bash               |             []                 []    [] []    [] |
-     bfd                |                                []                |
-     binutils           |                                []             [] |
-     bison              |             []         []                     [] |
-     bison-runtime      |             []     []  []   [] []       [] [] [] |
-     buzztrax           |                                                  |
-     ccd2cue            |                        []                        |
-     ccide              |             []                 []             [] |
-     cflow              |             []                                [] |
-     clisp              |                                []                |
-     coreutils          |             []                 []       []    [] |
-     cpio               |             []                 []             [] |
-     cppi               |             []         []                     [] |
-     cpplib             |                        []      []             [] |
-     cryptsetup         |             []                                [] |
-     datamash           |                        []                     [] |
-     denemo             |                                                  |
-     dfarc              |             []         []                     [] |
-     dialog             |             []         []   [] []    [] []    [] |
-     dico               |             []                                   |
-     diffutils          |             []                                [] |
-     dink               |                                                  |
-     direvent           |             []         []                        |
-     doodle             |                                            [] [] |
-     dos2unix           |             []         []      []             [] |
-     dos2unix-man       |             []         []                        |
-     e2fsprogs          |             []                                   |
-     enscript           |             []         []   [] []       []    [] |
-     exif               |             []         []   [] []    []       [] |
-     fetchmail          |             []                 []          []    |
-     findutils          |             []         []      []       []    [] |
-     flex               |             []         []   [] []             [] |
-     freedink           |             []         []      []       []    [] |
-     fusionforge        |                                                  |
-     gas                |                                                  |
-     gawk               |             []                                   |
-     gcal               |                                                  |
-     gcc                |                                                  |
-     gdbm               |             []         []                     [] |
-     gettext-examples   |             []     []  []   [] []    [] []    [] |
-     gettext-runtime    | []          []     []  []   [] []    [] []    [] |
-     gettext-tools      |             []         []   [] []    [] []    [] |
-     gjay               |                                               [] |
-     glunarclock        |             []         []   []       [] []    [] |
-     gnubiff            |                                               [] |
-     gnubik             |             []         []               []    [] |
-     gnucash            |             ()         ()   () ()             [] |
-     gnuchess           |                        []                     [] |
-     gnulib             |             []         []      []       []    [] |
-     gnunet             |                                                  |
-     gnunet-gtk         |                                                  |
-     gold               |                                                  |
-     gphoto2            |             []         []   [] []             [] |
-     gprof              |                        []   [] []             [] |
-     gramadoir          |                                      []       [] |
-     grep               |             []         []      []    [] []    [] |
-     grub               |             []         []      []       []    [] |
-     gsasl              |             []                       []       [] |
-     gss                |             []              []       []       [] |
-     gst-plugins-bad    |             []         []      []             [] |
-     gst-plugins-base   |             []         []      []    [] []    [] |
-     gst-plugins-good   |             []         []   [] []    [] []    [] |
-     gst-plugins-ugly   |             []         []   [] []    [] []    [] |
-     gstreamer          |             []         []   [] []    [] []    [] |
-     gtick              |             []         []      []    []       [] |
-     gtkam              |          [] []         []      []    []       [] |
-     gtkspell           |             []     []  []   [] []    [] [] [] [] |
-     guix               |                                                  |
-     guix-packages      |                                                  |
-     gutenprint         |                                      [] []       |
-     hello              |             []         []      []    [] []    [] |
-     help2man           |             []         []      []             [] |
-     help2man-texi      |             []                                   |
-     hylafax            |                                                  |
-     idutils            |             []                 []             [] |
-     iso_15924          |             []     ()       [] []       []    [] |
-     iso_3166           | [] []    [] []     ()  []   [] [] [] [] [] [] [] |
-     iso_3166_2         |             []     ()                         [] |
-     iso_4217           | []          []     ()       [] [] []    []    [] |
-     iso_639            |    []    [] []     ()       [] [] [] [] []    [] |
-     iso_639_3          |          []        ()                            |
-     iso_639_5          |                    ()                         [] |
-     jwhois             |             []         []   []                [] |
-     kbd                |             []                 []                |
-     klavaro            |          [] []         []      []       []       |
-     latrine            |                        []                        |
-     ld                 |                                                  |
-     leafpad            | []    []    []     []  []      []    [] []    [] |
-     libc               |             []                 []    []          |
-     libexif            |             []         ()            []          |
-     libextractor       |             []                                   |
-     libgnutls          |             []                                   |
-     libgphoto2         |             []                                   |
-     libgphoto2_port    |             []         []      []    []       [] |
-     libgsasl           |             []              []       []       [] |
-     libiconv           |             []         []            [] []    [] |
-     libidn             |             []         []                     [] |
-     liferea            |             []     []  []   [] ()    []    []    |
-     lilypond           |                                                  |
-     lordsawar          |                                                  |
-     lprng              |             []                                   |
-     lynx               |                        []      []                |
-     m4                 |             []         []   [] []             [] |
-     mailfromd          |             []                                   |
-     mailutils          |             []                                   |
-     make               |             []         []      []                |
-     man-db             |             []                 []             [] |
-     man-db-manpages    |             []                 []             [] |
-     midi-instruments   |             []     []  []   [] []    [] []    [] |
-     minicom            |             []         []   [] []                |
-     mkisofs            |             []                 []             [] |
-     myserver           |                                         []    [] |
-     nano               |             []         []   [] []       []    [] |
-     opcodes            |                                                  |
-     parted             |             []         []      []    [] []    [] |
-     pies               |             []                                   |
-     popt               |             []     []  []      []       []    [] |
-     procps-ng          |             []                                   |
-     procps-ng-man      |             []                                   |
-     psmisc             |             []         []      []             [] |
-     pspp               |             []                 []                |
-     pushover           |                                                  |
-     pwdutils           |             []                                   |
-     pyspread           | []                     []                        |
-     radius             |             []                 []                |
-     recode             |             []     []  []   [] []    [] []    [] |
-     recutils           |                                               [] |
-     rpm                |             []                                   |
-     rush               |             []         []                     [] |
-     sarg               |                        []      []                |
-     sed                |             []     []  []   [] []    [] []    [] |
-     sharutils          |             []         []                     [] |
-     shishi             |             []                                [] |
-     skribilo           |                                                  |
-     solfege            |             []         []      []                |
-     solfege-manual     |             []         []                        |
-     spotmachine        |                        []                     [] |
-     sudo               |             []         []      []    [] []    [] |
-     sudoers            |             []         []               []    [] |
-     sysstat            |             []         []      []    []       [] |
-     tar                |             []         []      []       []    [] |
-     texinfo            |             []         []      []                |
-     texinfo_document   |             []         []                        |
-     tigervnc           |                        []                        |
-     tin                |                                []                |
-     tin-man            |                                                  |
-     tracgoogleappsa... |             []         []      []             [] |
-     trader             |                                []                |
-     util-linux         |             []         []                        |
-     ve                 |             []         []                     [] |
-     vice               |                                                  |
-     vmm                |                                                  |
-     vorbis-tools       |             []                          []    [] |
-     wastesedge         |                                                  |
-     wcd                |                                                  |
-     wcd-man            |                                                  |
-     wdiff              |             []         []      []       []    [] |
-     wget               |             []         []      []    []          |
-     wyslij-po          | []          []         []                     [] |
-     xboard             |             []                 []             [] |
-     xdg-user-dirs      | [] []    [] []  [] []  []   [] []    [] [] [] [] |
-     xkeyboard-config   |             []         []      []       []       |
-                        +--------------------------------------------------+
-                          nn or os pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-                           7  3  1  6 114  1 12  83   32 80  3 38 45  7 94
+                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
+                        +------------------------------------------------+
+     a2ps               |          []     []  []   [] []       []    []  |
+     aegis              |                     []      []                 |
+     anubis             |          []                 []             []  |
+     aspell             |          []         []   [] []    [] []    []  |
+     bash               |          []         []      []    [] []    []  |
+     bfd                |                             []             []  |
+     binutils           |                             []             []  |
+     bison              |          []         []                     []  |
+     bison-runtime      |          []     []  []   [] []       [] [] []  |
+     buzztrax           |                     []                         |
+     ccd2cue            |                     []                     []  |
+     ccide              |          []                 []             []  |
+     cflow              |          []         []                     []  |
+     clisp              |                             []                 |
+     coreutils          |          []                 []       []    []  |
+     cpio               |          []                 []             []  |
+     cppi               |          []         []                     []  |
+     cpplib             |                     []      []             []  |
+     cryptsetup         |          []         []                     []  |
+     datamash           |                     []                     []  |
+     denemo             |                                                |
+     dfarc              |          []         []                     []  |
+     dialog             |          []         []   [] []    [] []    []  |
+     dico               |          []                                    |
+     diffutils          |          []         []                     []  |
+     dink               |                                                |
+     direvent           |          []         []                     []  |
+     doodle             |                                         [] []  |
+     dos2unix           |          []         []      []             []  |
+     dos2unix-man       |          []         []                         |
+     e2fsprogs          |          []                                    |
+     enscript           |          []         []   [] []       []    []  |
+     exif               |          []         []   [] []    []       []  |
+     fetchmail          |          []                 []          []     |
+     findutils          |          []         []      []    [] []    []  |
+     flex               |          []         []   [] []             []  |
+     freedink           |          []         []      []       []    []  |
+     fusionforge        |                                                |
+     gas                |                                                |
+     gawk               |          []                                    |
+     gcal               |                                                |
+     gcc                |                                                |
+     gdbm               |          []         []                     []  |
+     gettext-examples   |          []     []  []   [] []    [] []    []  |
+     gettext-runtime    | []       []     []  []   [] []    [] []    []  |
+     gettext-tools      |          []         []   [] []    [] []    []  |
+     gjay               |                                            []  |
+     glunarclock        |          []         []   []       [] []    []  |
+     gnubiff            |                                            []  |
+     gnubik             |          []         []               []    []  |
+     gnucash            |          ()     ()  ()   () ()             []  |
+     gnuchess           |                     []                     []  |
+     gnulib             |          []         []      []       []    []  |
+     gnunet             |                                                |
+     gnunet-gtk         |                                                |
+     gold               |                                                |
+     gphoto2            |          []         []   [] []             []  |
+     gprof              |                     []   [] []             []  |
+     gramadoir          |                                   []       []  |
+     grep               |          []         []      []    [] []    []  |
+     grub               |          []         []      []       []    []  |
+     gsasl              |          []                       []       []  |
+     gss                |          []              []       []       []  |
+     gst-plugins-bad    |          []         []      []    []       []  |
+     gst-plugins-base   |          []         []      []    [] []    []  |
+     gst-plugins-good   |          []         []   [] []    [] []    []  |
+     gst-plugins-ugly   |          []         []   [] []    [] []    []  |
+     gstreamer          |          []         []   [] []    [] []    []  |
+     gtick              |          []         []      []    []       []  |
+     gtkam              |       [] []         []      []    []       []  |
+     gtkspell           |          []     []  []   [] []    [] [] [] []  |
+     guix               |                                                |
+     guix-packages      |                                                |
+     gutenprint         |                                   [] []        |
+     hello              |          []         []      []    [] []    []  |
+     help2man           |          []         []      []             []  |
+     help2man-texi      |          []                                    |
+     hylafax            |                                                |
+     idutils            |          []                 []             []  |
+     iso_15924          |          []     ()       [] []       []    []  |
+     iso_3166           | [] [] [] []     ()  []   [] [] [] [] [] [] []  |
+     iso_3166_2         |          []     ()                         []  |
+     iso_4217           | []       []     ()       [] [] []    []    []  |
+     iso_639            |    [] [] []     ()       [] [] [] [] []    []  |
+     iso_639_3          |       []        ()                             |
+     iso_639_5          |                 ()                         []  |
+     jwhois             |          []         []   []                []  |
+     kbd                |          []                 []                 |
+     klavaro            |       [] []         []      []       []        |
+     ld                 |                                                |
+     leafpad            | []       []     []  []      []    [] []    []  |
+     libc               |          []                 []    []           |
+     libexif            |          []         ()            []           |
+     libextractor       |          []                                    |
+     libgnutls          |          []                                    |
+     libgphoto2         |          []                                    |
+     libgphoto2_port    |          []         []      []    []       []  |
+     libgsasl           |          []              []       []       []  |
+     libiconv           |          []         []            [] []    []  |
+     libidn             |          []         []                     []  |
+     liferea            |          []     []  []   [] ()    []    []     |
+     lilypond           |                                                |
+     lordsawar          |                                                |
+     lprng              |          []                                    |
+     lynx               |                     []      []                 |
+     m4                 |          []         []   [] []             []  |
+     mailfromd          |          []                                    |
+     mailutils          |          []                                    |
+     make               |          []         []      []                 |
+     man-db             |          []                 []             []  |
+     man-db-manpages    |          []                 []             []  |
+     midi-instruments   |          []     []  []   [] []    [] []    []  |
+     minicom            |          []         []   [] []                 |
+     mkisofs            |          []                 []             []  |
+     myserver           |                                      []    []  |
+     nano               |          []         []   [] []       []    []  |
+     opcodes            |                                                |
+     parted             |          []         []      []    [] []    []  |
+     pies               |          []                                    |
+     pnmixer            |                             []                 |
+     popt               |          []     []  []      []       []    []  |
+     procps-ng          |          []                                    |
+     procps-ng-man      |          []                                    |
+     psmisc             |          []         []      []             []  |
+     pspp               |          []                 []                 |
+     pushover           |                                                |
+     pwdutils           |          []                                    |
+     pyspread           | []                  []                         |
+     radius             |          []                 []                 |
+     recode             |          []     []  []   [] []    [] []    []  |
+     recutils           |                     []                     []  |
+     rpm                |          []                                    |
+     rush               |          []         []                     []  |
+     sarg               |                     []      []                 |
+     sed                |          []     []  []   [] []    [] []    []  |
+     sharutils          |          []         []                     []  |
+     shishi             |          []                                []  |
+     skribilo           |                                            []  |
+     solfege            |          []         []      []                 |
+     solfege-manual     |          []         []                         |
+     spotmachine        |                     []                     []  |
+     sudo               |          []         []      []    [] []    []  |
+     sudoers            |          []         []               []    []  |
+     sysstat            |          []         []      []    []       []  |
+     tar                |          []         []      []       []    []  |
+     texinfo            |          []         []      []                 |
+     texinfo_document   |          []         []                         |
+     tigervnc           |                     []      []             []  |
+     tin                |                             []                 |
+     tin-man            |                                                |
+     tracgoogleappsa... |          []         []      []             []  |
+     trader             |                             []             []  |
+     util-linux         |          []         []                         |
+     ve                 |          []         []                     []  |
+     vice               |                                                |
+     vmm                |                                                |
+     vorbis-tools       |          []                          []    []  |
+     wastesedge         |                                                |
+     wcd                |                                                |
+     wcd-man            |                                                |
+     wdiff              |          []         []      []       []    []  |
+     wget               |          []         []      []    []       []  |
+     wyslij-po          | []       []         []                     []  |
+     xboard             |          []                 []             []  |
+     xdg-user-dirs      | [] [] [] []  [] []  []   [] []    [] [] [] []  |
+     xkeyboard-config   |          []         []      []       []        |
+                        +------------------------------------------------+
+                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
+                           7  3  6 114  1 12  88   32 82  3 40 45  7 101
 
-                          sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
-                        +---------------------------------------------------+
-     a2ps               | []             [] [] []     []                    |
-     aegis              |                             []                    |
-     anubis             | []                [] []     []                    |
-     aspell             |                      []     []  []     []         |
-     bash               | []                   []     []         []         |
-     bfd                |                      []     []                    |
-     binutils           | []                   []     []                    |
-     bison              | []                   []     []         []         |
-     bison-runtime      | []             [] [] []     []         []         |
-     buzztrax           | []                          []         []         |
-     ccd2cue            |                      []     []         []         |
-     ccide              | []                   []     []         []         |
-     cflow              | []                   []     []         []         |
-     clisp              |                                                   |
-     coreutils          | []                   []     []         []         |
-     cpio               | []                [] []     []         []         |
-     cppi               | []                   []     []         []         |
-     cpplib             | []                [] []     []         []         |
-     cryptsetup         |                      []     []         []         |
-     datamash           | []                   []     []                    |
-     denemo             |                                                   |
-     dfarc              |                             []                    |
-     dialog             | [] []          []           []  []     []         |
-     dico               |                      []                           |
-     diffutils          | []                [] []     []         []         |
-     dink               |                                                   |
-     direvent           |                      []     []                    |
-     doodle             | []                          []                    |
-     dos2unix           | []                   []     []         []         |
-     dos2unix-man       | []                   []                []         |
-     e2fsprogs          | []                   []     []         []         |
-     enscript           | []                [] []     []                    |
-     exif               | []                [] []     []         []         |
-     fetchmail          | []                []        []         []         |
-     findutils          | []                [] []     []         []         |
-     flex               | []                []        []         []         |
-     freedink           |                []           []                    |
-     fusionforge        |                                                   |
-     gas                |                      []                           |
-     gawk               | []                          []                    |
-     gcal               | []                []                              |
-     gcc                | []                                     []         |
-     gdbm               |                      []     []                    |
-     gettext-examples   | []                [] []     []         []    []   |
-     gettext-runtime    | []                [] []     []         []    []   |
-     gettext-tools      | []                [] []     []         []         |
-     gjay               |                []           []                    |
-     glunarclock        | []                          []  []     []         |
-     gnubiff            | []                          []                    |
-     gnubik             | []                   []     []         []         |
-     gnucash            |       () ()              () ()         []         |
-     gnuchess           |                      []     []                    |
-     gnulib             | []                   []     []         []         |
-     gnunet             |                                                   |
-     gnunet-gtk         |                                                   |
-     gold               |                      []     []                    |
-     gphoto2            | []                   []     []         []         |
-     gprof              | []                [] []     []                    |
-     gramadoir          | []                          []         []         |
-     grep               | []             []    []     []         []         |
-     grub               | []                [] []     []                    |
-     gsasl              | []                   []     []         []         |
-     gss                | []                          []         []         |
-     gst-plugins-bad    | []                   []     []         []         |
-     gst-plugins-base   | []                [] []     []         []         |
-     gst-plugins-good   | []                [] []     []         []         |
-     gst-plugins-ugly   | []                [] []     []         []         |
-     gstreamer          | []                [] []     []         []         |
-     gtick              |                      []     []         []         |
-     gtkam              | []                   []     []         []         |
-     gtkspell           | []             [] [] []     []  []     []    []   |
-     guix               |                             []                    |
-     guix-packages      |                                                   |
-     gutenprint         |                   [] []     []         []         |
-     hello              | []             [] [] []     []         []         |
-     help2man           |                      []     []         []         |
-     help2man-texi      |                      []                           |
-     hylafax            |                             []                    |
-     idutils            |                      []     []         []         |
-     iso_15924          | []             () [] []     ()         []         |
-     iso_3166           | []       []    () [] []     ()  []     []    []   |
-     iso_3166_2         |                () [] []     ()         []         |
-     iso_4217           | []             () [] []     ()         []    []   |
-     iso_639            | []    [] []    () [] []     ()  []     []    []   |
-     iso_639_3          |       []       () [] []     ()                    |
-     iso_639_5          |                ()    []     ()                    |
-     jwhois             | []                []        []         []         |
-     kbd                |                      []     []         []         |
-     klavaro            | []                   []  [] []     []  []         |
-     latrine            |                             []         []         |
-     ld                 | []                [] []     []         []         |
-     leafpad            | []             [] [] []     []         []         |
-     libc               | []                [] []     []         []         |
-     libexif            |                             []         ()         |
-     libextractor       |                      []     []                    |
-     libgnutls          | []                   []     []         []         |
-     libgphoto2         |                      []     []                    |
-     libgphoto2_port    | []                   []     []         []         |
-     libgsasl           | []                   []     []         []         |
-     libiconv           | []                   []     []  []     []         |
-     libidn             | ()                   []     []         []         |
-     liferea            | []                [] []     []         []         |
-     lilypond           |                             []                    |
-     lordsawar          |                                                   |
-     lprng              |                             []                    |
-     lynx               | []                [] []     []                    |
-     m4                 | []                          []         []         |
-     mailfromd          |                      []     []                    |
-     mailutils          |                             []                    |
-     make               | []                   []     []         []         |
-     man-db             |                             []         []         |
-     man-db-manpages    |                                        []         |
-     midi-instruments   | []             [] [] []     []         []         |
-     minicom            | []                          []                    |
-     mkisofs            |                      []     []         []         |
-     myserver           |                             []                    |
-     nano               | []                   []     []         []         |
-     opcodes            |                      []     []         []         |
-     parted             | []                [] []     []         []         |
-     pies               |                      []     []                    |
-     popt               | []    []       [] [] []     []         []         |
-     procps-ng          |                      []     []                    |
-     procps-ng-man      |                      []                           |
-     psmisc             | []                   []     []         []         |
-     pspp               |                   [] []                []         |
-     pushover           | []                                                |
-     pwdutils           | []                          []                    |
-     pyspread           |                      []                           |
-     radius             |                      []     []                    |
-     recode             | []                []        []         []         |
-     recutils           | []                   []     []                    |
-     rpm                | []                   []     []         []         |
-     rush               |                      []     []                    |
-     sarg               |                                                   |
-     sed                | []                [] []     []         []         |
-     sharutils          |                      []     []         []         |
-     shishi             |                             []         []         |
-     skribilo           | []                                                |
-     solfege            |                   []        []         []         |
-     solfege-manual     |                   []                              |
-     spotmachine        | []                   []     []                    |
-     sudo               |                   [] []     []         []         |
-     sudoers            |                      []     []         []         |
-     sysstat            | []                [] []     []         []         |
-     tar                | []                [] []     []         []         |
-     texinfo            |                   [] []     []                    |
-     texinfo_document   |                      []                           |
-     tigervnc           | []                   []                           |
-     tin                |                                        []         |
-     tin-man            |                                                   |
-     tracgoogleappsa... | []             []    []     []         []         |
-     trader             | []                                                |
-     util-linux         |                      []     []         []         |
-     ve                 | []                   []     []         []         |
-     vice               | ()                ()                              |
-     vmm                |                                                   |
-     vorbis-tools       | []                          []                    |
-     wastesedge         |                                                   |
-     wcd                |                      []     []         []         |
-     wcd-man            |                      []                           |
-     wdiff              | []                   []     []         []         |
-     wget               |                      []     []         []         |
-     wyslij-po          |                      []     []                    |
-     xboard             |                      []                           |
-     xdg-user-dirs      | []    [] []    [] [] []     []         []    []   |
-     xkeyboard-config   | []                [] []     []                    |
-                        +---------------------------------------------------+
-                          sv sw ta te tg th tr uk  ur vi  wa wo zh_CN zh_HK
-                          91  1  4  3  0 13 50 113  1 126  7  1  95     7
+                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
+                        +----------------------------------------------+
+     a2ps               | []              [] [] []     []              |
+     aegis              |                              []              |
+     anubis             | []                 [] []     []              |
+     aspell             | []                    []     []  []     []   |
+     bash               | []                    []     []         []   |
+     bfd                | []                    []     []              |
+     binutils           | []                    []     []              |
+     bison              | []                    []     []         []   |
+     bison-runtime      | []              [] [] []     []         []   |
+     buzztrax           | []                           []         []   |
+     ccd2cue            |                       []     []         []   |
+     ccide              | []                    []     []         []   |
+     cflow              | []                    []     []         []   |
+     clisp              |                                              |
+     coreutils          | []                    []     []              |
+     cpio               | []                 [] []     []         []   |
+     cppi               | []                    []     []         []   |
+     cpplib             | []                 [] []     []         []   |
+     cryptsetup         |                       []     []         []   |
+     datamash           | []                    []     []              |
+     denemo             |                                         []   |
+     dfarc              | []                           []              |
+     dialog             | []  []          []           []  []     []   |
+     dico               |                       []                     |
+     diffutils          | []                 [] []     []         []   |
+     dink               | []                                           |
+     direvent           |                       []     []              |
+     doodle             | []                           []              |
+     dos2unix           | []                    []     []         []   |
+     dos2unix-man       | []                    []                []   |
+     e2fsprogs          | []                    []     []         []   |
+     enscript           | []                 [] []     []              |
+     exif               | []                 [] []     []         []   |
+     fetchmail          | []                 []        []         []   |
+     findutils          | []                 [] []     []         []   |
+     flex               | []                 []        []         []   |
+     freedink           | []              []           []              |
+     fusionforge        |                                              |
+     gas                |                       []                     |
+     gawk               | []                           []         []   |
+     gcal               | []                 []                   []   |
+     gcc                | []                                           |
+     gdbm               |                       []     []              |
+     gettext-examples   | []                 [] []     []         []   |
+     gettext-runtime    | []                 [] []     []         []   |
+     gettext-tools      | []                 [] []     []         []   |
+     gjay               |                 []           []         []   |
+     glunarclock        | []                           []  []     []   |
+     gnubiff            | []                           []              |
+     gnubik             | []                    []     []         []   |
+     gnucash            |        () ()              () ()         []   |
+     gnuchess           |                       []     []         []   |
+     gnulib             | []                    []     []         []   |
+     gnunet             |                                              |
+     gnunet-gtk         |                                              |
+     gold               |                       []     []              |
+     gphoto2            | []                    []     []         []   |
+     gprof              | []                 [] []     []              |
+     gramadoir          | []                           []         []   |
+     grep               | []              []    []     []         []   |
+     grub               | []                 [] []     []              |
+     gsasl              | []                    []     []         []   |
+     gss                | []                           []         []   |
+     gst-plugins-bad    | []                 [] []     []         []   |
+     gst-plugins-base   | []                 [] []     []         []   |
+     gst-plugins-good   | []                 [] []     []         []   |
+     gst-plugins-ugly   | []                 [] []     []         []   |
+     gstreamer          | []                 [] []     []         []   |
+     gtick              |                       []     []         []   |
+     gtkam              | []                    []     []         []   |
+     gtkspell           | []              [] [] []     []  []     []   |
+     guix               |                                              |
+     guix-packages      |                                              |
+     gutenprint         |                    [] []     []         []   |
+     hello              | []              [] [] []     []         []   |
+     help2man           |                       []     []         []   |
+     help2man-texi      |                       []                     |
+     hylafax            |                              []              |
+     idutils            |                       []     []         []   |
+     iso_15924          | []              () [] []     ()         []   |
+     iso_3166           | []        []    () [] []     ()  []     []   |
+     iso_3166_2         |                 () [] []     ()         []   |
+     iso_4217           | []              () [] []     ()         []   |
+     iso_639            | []     [] []    () [] []     ()  []     []   |
+     iso_639_3          |        []       () [] []     ()              |
+     iso_639_5          |                 ()    []     ()              |
+     jwhois             | []                 []        []         []   |
+     kbd                | []                    []     []         []   |
+     klavaro            | []                    []  [] []     []  []   |
+     ld                 | []                 [] []     []         []   |
+     leafpad            | []              [] [] []     []         []   |
+     libc               | []                 [] []     []         []   |
+     libexif            | []                           []         ()   |
+     libextractor       |                       []     []              |
+     libgnutls          | []                    []     []         []   |
+     libgphoto2         | []                    []     []              |
+     libgphoto2_port    | []                    []     []         []   |
+     libgsasl           | []                    []     []         []   |
+     libiconv           | []                    []     []  []     []   |
+     libidn             | ()                    []     []         []   |
+     liferea            | []                 [] []     []         []   |
+     lilypond           |                              []              |
+     lordsawar          |                                              |
+     lprng              |                              []              |
+     lynx               | []                 [] []     []              |
+     m4                 | []                           []         []   |
+     mailfromd          |                       []     []              |
+     mailutils          |                              []              |
+     make               | []                    []     []         []   |
+     man-db             | []                           []         []   |
+     man-db-manpages    | []                                      []   |
+     midi-instruments   | []              [] [] []     []         []   |
+     minicom            | []                           []              |
+     mkisofs            |                       []     []         []   |
+     myserver           |                              []              |
+     nano               | []                    []     []         []   |
+     opcodes            |                       []     []         []   |
+     parted             | []                 [] []     []         []   |
+     pies               |                       []     []              |
+     pnmixer            |                       []     []         []   |
+     popt               | []     []       [] [] []     []         []   |
+     procps-ng          |                       []     []              |
+     procps-ng-man      |                       []                     |
+     psmisc             | []                    []     []         []   |
+     pspp               |                    [] []                []   |
+     pushover           | []                                           |
+     pwdutils           | []                           []              |
+     pyspread           |                       []                     |
+     radius             |                       []     []              |
+     recode             | []                 []        []         []   |
+     recutils           | []                    []     []              |
+     rpm                | []                    []     []         []   |
+     rush               |                       []     []              |
+     sarg               |                                              |
+     sed                | []                 [] []     []         []   |
+     sharutils          | []                    []     []         []   |
+     shishi             |                              []         []   |
+     skribilo           | []                    []                     |
+     solfege            | []                 []        []         []   |
+     solfege-manual     |                    []                        |
+     spotmachine        | []                    []     []              |
+     sudo               | []                 [] []     []         []   |
+     sudoers            | []                    []     []         []   |
+     sysstat            | []                 [] []     []         []   |
+     tar                | []                 [] []     []         []   |
+     texinfo            |                    [] []     []              |
+     texinfo_document   |                       []                     |
+     tigervnc           | []                    []                []   |
+     tin                |                                         []   |
+     tin-man            |                                              |
+     tracgoogleappsa... | []              []    []     []         []   |
+     trader             | []                                           |
+     util-linux         | []                    []     []         []   |
+     ve                 | []                    []     []         []   |
+     vice               | ()                 ()                        |
+     vmm                |                                              |
+     vorbis-tools       | []                           []              |
+     wastesedge         |                                              |
+     wcd                |                       []     []         []   |
+     wcd-man            |                       []                     |
+     wdiff              | []                    []     []         []   |
+     wget               |                       []     []         []   |
+     wyslij-po          |                       []     []              |
+     xboard             |                       []                []   |
+     xdg-user-dirs      | []     [] []    [] [] []     []         []   |
+     xkeyboard-config   | []                 [] []     []              |
+                        +----------------------------------------------+
+                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
+                          106  1  4  3  0 13 51 115  1 125  7  1  100 
 
-                          zh_TW
-                        +-------+
-     a2ps               |       | 30
-     aegis              |       |  9
-     anubis             |       | 19
-     aspell             |       | 28
-     bash               |  []   | 21
-     bfd                |       |  9
-     binutils           |       | 12
-     bison              |  []   | 18
-     bison-runtime      |  []   | 38
-     buzztrax           |       |  8
-     ccd2cue            |       |  8
-     ccide              |       | 17
-     cflow              |       | 15
-     clisp              |       | 10
-     coreutils          |       | 20
-     cpio               |       | 20
-     cppi               |       | 17
-     cpplib             |  []   | 19
-     cryptsetup         |       | 13
-     datamash           |       | 11
-     denemo             |       |  4
-     dfarc              |       | 16
-     dialog             |  []   | 42
-     dico               |       |  6
-     diffutils          |       | 21
-     dink               |       |  9
-     direvent           |       | 10
-     doodle             |       | 12
-     dos2unix           |  []   | 18
-     dos2unix-man       |       |  9
-     e2fsprogs          |       | 14
-     enscript           |       | 21
-     exif               |       | 26
-     fetchmail          |       | 19
-     findutils          |       | 28
-     flex               |  []   | 19
-     freedink           |       | 23
-     fusionforge        |       |  3
-     gas                |       |  5
-     gawk               |       | 12
-     gcal               |       |  7
-     gcc                |       |  4
-     gdbm               |       | 10
-     gettext-examples   |  []   | 40
-     gettext-runtime    |  []   | 34
-     gettext-tools      |  []   | 24
-     gjay               |       |  8
-     glunarclock        |  []   | 27
-     gnubiff            |       |  9
-     gnubik             |       | 19
-     gnucash            |  ()   |  7
-     gnuchess           |       | 10
-     gnulib             |       | 23
-     gnunet             |       |  1
-     gnunet-gtk         |       |  1
-     gold               |       |  7
-     gphoto2            |  []   | 19
-     gprof              |       | 21
-     gramadoir          |       | 14
-     grep               |  []   | 31
-     grub               |       | 21
-     gsasl              |  []   | 19
-     gss                |       | 17
-     gst-plugins-bad    |       | 14
-     gst-plugins-base   |       | 27
-     gst-plugins-good   |       | 32
-     gst-plugins-ugly   |       | 34
-     gstreamer          |  []   | 31
-     gtick              |       | 19
-     gtkam              |       | 24
-     gtkspell           |  []   | 48
-     guix               |       |  3
-     guix-packages      |       |  0
-     gutenprint         |       | 15
-     hello              |  []   | 30
-     help2man           |       | 18
-     help2man-texi      |       |  5
-     hylafax            |       |  5
-     idutils            |       | 14
-     iso_15924          |  []   | 23
-     iso_3166           |  []   | 58
-     iso_3166_2         |       |  9
-     iso_4217           |  []   | 28
-     iso_639            |  []   | 46
-     iso_639_3          |       | 10
-     iso_639_5          |       |  2
-     jwhois             |  []   | 20
-     kbd                |       | 16
-     klavaro            |       | 30
-     latrine            |       |  7
-     ld                 |  []   | 15
-     leafpad            |  []   | 40
-     libc               |  []   | 24
-     libexif            |       |  9
-     libextractor       |       |  5
-     libgnutls          |       | 13
-     libgphoto2         |       |  9
-     libgphoto2_port    |  []   | 19
-     libgsasl           |       | 18
-     libiconv           |  []   | 29
-     libidn             |       | 17
-     liferea            |       | 29
-     lilypond           |       | 11
-     lordsawar          |       |  3
-     lprng              |       |  3
-     lynx               |       | 19
-     m4                 |  []   | 22
-     mailfromd          |       |  4
-     mailutils          |       |  6
-     make               |       | 19
-     man-db             |       | 14
-     man-db-manpages    |       |  9
-     midi-instruments   |  []   | 43
-     minicom            |  []   | 17
-     mkisofs            |       | 13
-     myserver           |       |  9
-     nano               |  []   | 29
-     opcodes            |       | 12
-     parted             |  []   | 21
-     pies               |       |  4
-     popt               |  []   | 36
-     procps-ng          |       |  5
-     procps-ng-man      |       |  4
-     psmisc             |  []   | 22
-     pspp               |       | 13
-     pushover           |       |  6
-     pwdutils           |       |  8
-     pyspread           |       |  6
-     radius             |       |  9
-     recode             |       | 31
-     recutils           |       |  9
-     rpm                |  []   | 13
-     rush               |       | 10
-     sarg               |       |  4
-     sed                |  []   | 34
-     sharutils          |       | 12
-     shishi             |       |  7
-     skribilo           |       |  4
-     solfege            |       | 19
-     solfege-manual     |       |  9
-     spotmachine        |       | 10
-     sudo               |       | 24
-     sudoers            |       | 20
-     sysstat            |       | 22
-     tar                |  []   | 30
-     texinfo            |       | 17
-     texinfo_document   |       | 11
-     tigervnc           |       | 11
-     tin                |  []   |  7
-     tin-man            |       |  1
-     tracgoogleappsa... |  []   | 22
-     trader             |       | 11
-     util-linux         |       | 12
-     ve                 |       | 14
-     vice               |       |  1
-     vmm                |       |  3
-     vorbis-tools       |       | 13
-     wastesedge         |       |  2
-     wcd                |       |  8
-     wcd-man            |       |  3
-     wdiff              |  []   | 23
-     wget               |       | 19
-     wyslij-po          |       | 14
-     xboard             |       |  9
-     xdg-user-dirs      |  []   | 68
-     xkeyboard-config   |  []   | 27
-                        +-------+
-       90 teams           zh_TW
-      166 domains          42    2748
+                          zh_HK zh_TW
+                        +-------------+
+     a2ps               |             | 30
+     aegis              |             |  9
+     anubis             |             | 19
+     aspell             |             | 29
+     bash               |        []   | 23
+     bfd                |             | 11
+     binutils           |             | 12
+     bison              |        []   | 18
+     bison-runtime      |        []   | 38
+     buzztrax           |             |  9
+     ccd2cue            |             | 10
+     ccide              |             | 17
+     cflow              |             | 16
+     clisp              |             | 10
+     coreutils          |             | 18
+     cpio               |             | 20
+     cppi               |             | 17
+     cpplib             |        []   | 19
+     cryptsetup         |             | 14
+     datamash           |             | 11
+     denemo             |             |  5
+     dfarc              |             | 17
+     dialog             |        []   | 42
+     dico               |             |  6
+     diffutils          |             | 22
+     dink               |             | 10
+     direvent           |             | 11
+     doodle             |             | 12
+     dos2unix           |        []   | 18
+     dos2unix-man       |             |  9
+     e2fsprogs          |             | 15
+     enscript           |             | 21
+     exif               |             | 27
+     fetchmail          |             | 19
+     findutils          |             | 29
+     flex               |        []   | 19
+     freedink           |             | 24
+     fusionforge        |             |  3
+     gas                |             |  5
+     gawk               |             | 13
+     gcal               |             |  8
+     gcc                |             |  2
+     gdbm               |             | 10
+     gettext-examples   |  []    []   | 40
+     gettext-runtime    |  []    []   | 35
+     gettext-tools      |        []   | 24
+     gjay               |             |  9
+     glunarclock        |        []   | 27
+     gnubiff            |             |  9
+     gnubik             |             | 19
+     gnucash            |        ()   |  6
+     gnuchess           |             | 11
+     gnulib             |             | 23
+     gnunet             |             |  1
+     gnunet-gtk         |             |  1
+     gold               |             |  7
+     gphoto2            |        []   | 19
+     gprof              |             | 21
+     gramadoir          |             | 14
+     grep               |        []   | 31
+     grub               |             | 21
+     gsasl              |        []   | 19
+     gss                |             | 17
+     gst-plugins-bad    |             | 21
+     gst-plugins-base   |             | 27
+     gst-plugins-good   |             | 32
+     gst-plugins-ugly   |             | 34
+     gstreamer          |        []   | 32
+     gtick              |             | 19
+     gtkam              |             | 24
+     gtkspell           |  []    []   | 48
+     guix               |             |  2
+     guix-packages      |             |  0
+     gutenprint         |             | 15
+     hello              |        []   | 30
+     help2man           |             | 18
+     help2man-texi      |             |  5
+     hylafax            |             |  5
+     idutils            |             | 14
+     iso_15924          |        []   | 23
+     iso_3166           |  []    []   | 58
+     iso_3166_2         |             |  9
+     iso_4217           |  []    []   | 28
+     iso_639            |  []    []   | 46
+     iso_639_3          |             | 10
+     iso_639_5          |             |  2
+     jwhois             |        []   | 20
+     kbd                |             | 17
+     klavaro            |             | 30
+     ld                 |        []   | 15
+     leafpad            |        []   | 39
+     libc               |        []   | 24
+     libexif            |             | 10
+     libextractor       |             |  5
+     libgnutls          |             | 13
+     libgphoto2         |             | 10
+     libgphoto2_port    |        []   | 19
+     libgsasl           |             | 18
+     libiconv           |        []   | 29
+     libidn             |             | 17
+     liferea            |             | 29
+     lilypond           |             | 11
+     lordsawar          |             |  3
+     lprng              |             |  3
+     lynx               |             | 19
+     m4                 |        []   | 22
+     mailfromd          |             |  4
+     mailutils          |             |  6
+     make               |             | 19
+     man-db             |             | 15
+     man-db-manpages    |             | 10
+     midi-instruments   |        []   | 43
+     minicom            |        []   | 17
+     mkisofs            |             | 13
+     myserver           |             |  9
+     nano               |        []   | 30
+     opcodes            |             | 12
+     parted             |        []   | 23
+     pies               |             |  4
+     pnmixer            |             |  9
+     popt               |        []   | 36
+     procps-ng          |             |  5
+     procps-ng-man      |             |  4
+     psmisc             |        []   | 22
+     pspp               |             | 13
+     pushover           |             |  6
+     pwdutils           |             |  8
+     pyspread           |             |  6
+     radius             |             |  9
+     recode             |             | 31
+     recutils           |             | 10
+     rpm                |        []   | 13
+     rush               |             | 10
+     sarg               |             |  4
+     sed                |        []   | 35
+     sharutils          |             | 13
+     shishi             |             |  7
+     skribilo           |             |  7
+     solfege            |             | 21
+     solfege-manual     |             |  9
+     spotmachine        |             | 11
+     sudo               |             | 26
+     sudoers            |             | 22
+     sysstat            |             | 23
+     tar                |        []   | 30
+     texinfo            |             | 17
+     texinfo_document   |             | 13
+     tigervnc           |             | 14
+     tin                |        []   |  7
+     tin-man            |             |  1
+     tracgoogleappsa... |        []   | 22
+     trader             |             | 12
+     util-linux         |             | 13
+     ve                 |             | 14
+     vice               |             |  1
+     vmm                |             |  3
+     vorbis-tools       |             | 13
+     wastesedge         |             |  3
+     wcd                |             |  8
+     wcd-man            |             |  3
+     wdiff              |        []   | 23
+     wget               |             | 21
+     wyslij-po          |             | 14
+     xboard             |             | 10
+     xdg-user-dirs      |  []    []   | 68
+     xkeyboard-config   |        []   | 28
+                        +-------------+
+       89 teams           zh_HK zh_TW
+      166 domains           7    42    2809
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 5aa6d30..e69de29 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,11 +0,0 @@
-No more ChangeLog files
-========================
-Do not modify any of the ChangeLog files in gettext.  Starting on
-October 14th, 2015 we put changelog information only in the git commit
-log, and generate a top-level ChangeLog file from logs at "make dist"
-time.
-
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index 567b7ca..18c6b8f 100644
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools directory of GNU gettext
-## Copyright (C) 1995-2007, 2010, 2015 Free Software Foundation, Inc.
+## Copyright (C) 1995-2007, 2010, 2015-2016 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
diff --git a/gettext-tools/Makefile.in b/gettext-tools/Makefile.in
index 7ad6bfa..b5e4f0b 100644
--- a/gettext-tools/Makefile.in
+++ b/gettext-tools/Makefile.in
@@ -120,6 +120,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -156,6 +157,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-tools/aclocal.m4 b/gettext-tools/aclocal.m4
index 4e07a1c..339ef8c 100644
--- a/gettext-tools/aclocal.m4
+++ b/gettext-tools/aclocal.m4
@@ -1286,6 +1286,7 @@ m4_include([gnulib-m4/csharpexec.m4])
 m4_include([gnulib-m4/ctype.m4])
 m4_include([gnulib-m4/curses.m4])
 m4_include([gnulib-m4/dirent_h.m4])
+m4_include([gnulib-m4/dirfd.m4])
 m4_include([gnulib-m4/double-slash-root.m4])
 m4_include([gnulib-m4/dup.m4])
 m4_include([gnulib-m4/dup2.m4])
@@ -1323,6 +1324,7 @@ m4_include([gnulib-m4/getpagesize.m4])
 m4_include([gnulib-m4/gettimeofday.m4])
 m4_include([gnulib-m4/gnulib-common.m4])
 m4_include([gnulib-m4/gnulib-comp.m4])
+m4_include([gnulib-m4/hard-locale.m4])
 m4_include([gnulib-m4/iconv_h.m4])
 m4_include([gnulib-m4/iconv_open.m4])
 m4_include([gnulib-m4/include_next.m4])
diff --git a/gettext-tools/config.h.in b/gettext-tools/config.h.in
index 0813e79..6818a4d 100644
--- a/gettext-tools/config.h.in
+++ b/gettext-tools/config.h.in
@@ -47,6 +47,9 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
+/* Define to 1 if the C locale may have encoding errors. */
+#undef C_LOCALE_MAYBE_EILSEQ
+
 /* Define as the bit index in the word where to find bit 0 of the exponent of
    'double'. */
 #undef DBL_EXPBIT0_BIT
@@ -60,6 +63,16 @@
 /* Define as the word index where to find the sign of 'double'. */
 #undef DBL_SIGNBIT_WORD
 
+/* the name of the file descriptor member of DIR */
+#undef DIR_FD_MEMBER_NAME
+
+#ifdef DIR_FD_MEMBER_NAME
+# define DIR_TO_FD(Dir_p) ((Dir_p)->DIR_FD_MEMBER_NAME)
+#else
+# define DIR_TO_FD(Dir_p) -1
+#endif
+
+
 /* Define to 1 if // is a file system root distinct from /. */
 #undef DOUBLE_SLASH_IS_DISTINCT_ROOT
 
@@ -180,6 +193,9 @@
 /* Define to 1 when the gnulib module closedir should be tested. */
 #undef GNULIB_TEST_CLOSEDIR
 
+/* Define to 1 when the gnulib module dirfd should be tested. */
+#undef GNULIB_TEST_DIRFD
+
 /* Define to 1 when the gnulib module dup should be tested. */
 #undef GNULIB_TEST_DUP
 
@@ -636,6 +652,10 @@
    don't. */
 #undef HAVE_DECL_COPYSIGNL
 
+/* Define to 1 if you have the declaration of `dirfd', and to 0 if you don't.
+   */
+#undef HAVE_DECL_DIRFD
+
 /* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
    don't. */
 #undef HAVE_DECL_FEOF_UNLOCKED
@@ -807,6 +827,9 @@
 /* Define to 1 if you have the <dirent.h> header file. */
 #undef HAVE_DIRENT_H
 
+/* Define to 1 if you have the `dirfd' function. */
+#undef HAVE_DIRFD
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -2543,6 +2566,9 @@
 /* Define to 1 if readlink fails to recognize a trailing slash. */
 #undef READLINK_TRAILING_SLASH_BUG
 
+/* Define to 1 if gnulib's dirfd() replacement is used. */
+#undef REPLACE_DIRFD
+
 /* Define to 1 if stat needs help when passed a directory name with a trailing
    slash */
 #undef REPLACE_FUNC_STAT_DIR
@@ -2761,6 +2787,12 @@
    used. */
 #undef __GETOPT_PREFIX
 
+/* Define to 1 if the system <stdint.h> predates C++11. */
+#undef __STDC_CONSTANT_MACROS
+
+/* Define to 1 if the system <stdint.h> predates C++11. */
+#undef __STDC_LIMIT_MACROS
+
 /* Define as 'access' if you don't have the eaccess() function. */
 #undef eaccess
 
@@ -2810,6 +2842,7 @@
       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
       : (199901L <= __STDC_VERSION__ \
          && !defined __HP_cc \
+         && !defined __PGI \
          && !(defined __SUNPRO_C && __STDC__))) \
      && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
 # define _GL_INLINE inline
diff --git a/gettext-tools/configure b/gettext-tools/configure
index b7c3868..0fa4093 100755
--- a/gettext-tools/configure
+++ b/gettext-tools/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gettext-tools 0.19.7.
+# Generated by GNU Autoconf 2.69 for gettext-tools 0.19.8.1.
 #
 # Report bugs to <bug-gnu-gettext@gnu.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gettext-tools'
 PACKAGE_TARNAME='gettext-tools'
-PACKAGE_VERSION='0.19.7'
-PACKAGE_STRING='gettext-tools 0.19.7'
+PACKAGE_VERSION='0.19.8.1'
+PACKAGE_STRING='gettext-tools 0.19.8.1'
 PACKAGE_BUGREPORT='bug-gnu-gettext@gnu.org'
 PACKAGE_URL=''
 
@@ -1911,6 +1911,8 @@ GMSGFMT
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
+OS2_FALSE
+OS2_TRUE
 WOE32_FALSE
 WOE32_TRUE
 RC
@@ -2699,7 +2701,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gettext-tools 0.19.7 to adapt to many kinds of systems.
+\`configure' configures gettext-tools 0.19.8.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2770,7 +2772,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gettext-tools 0.19.7:";;
+     short | recursive ) echo "Configuration of gettext-tools 0.19.8.1:";;
    esac
   cat <<\_ACEOF
 
@@ -2948,7 +2950,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gettext-tools configure 0.19.7
+gettext-tools configure 0.19.8.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3778,7 +3780,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gettext-tools $as_me 0.19.7, which was
+It was created by gettext-tools $as_me 0.19.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4721,7 +4723,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gettext-tools'
- VERSION='0.19.7'
+ VERSION='0.19.8.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6598,7 +6600,7 @@ EOF
          > conftestver.class
        target_version=`{
          unset JAVA_HOME
-         echo "$as_me:6601: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
+         echo "$as_me:6603: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&5
          CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver 2>&5
        }`
        case "$target_version" in
@@ -6666,23 +6668,23 @@ EOF
         if $JAVAC --version 2>/dev/null | sed -e 1q | grep gcj > /dev/null; then
             if $JAVAC --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
                         rm -f conftest.class
-        if { echo "$as_me:6669: $JAVAC -d . conftest.java" >&5
+        if { echo "$as_me:6671: $JAVAC -d . conftest.java" >&5
              $JAVAC -d . conftest.java >&5 2>&1
            } \
            && test -f conftest.class \
            && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:6676: $JAVAC -fsource=$source_version -d . conftest.java" >&5
+          if { echo "$as_me:6678: $JAVAC -fsource=$source_version -d . conftest.java" >&5
                $JAVAC -fsource="$source_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
              && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-             && { echo "$as_me:6681: $JAVAC -d . conftestfail.java" >&5
+             && { echo "$as_me:6683: $JAVAC -d . conftestfail.java" >&5
                   $JAVAC -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:6685: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:6687: $JAVAC -fsource=$source_version -d . conftestfail.java" >&5
                     $JAVAC -fsource="$source_version" -d . conftestfail.java >&5 2>&1
                   }; then
             CONF_JAVAC="$JAVAC -fsource=$source_version"
@@ -6696,7 +6698,7 @@ EOF
         else
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:6699: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+          if { echo "$as_me:6701: $JAVAC -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
                $JAVAC -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
@@ -6709,7 +6711,7 @@ EOF
       else
                 if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
                     rm -f conftest.class
-          if { echo "$as_me:6712: $JAVAC -d . conftest.java" >&5
+          if { echo "$as_me:6714: $JAVAC -d . conftest.java" >&5
                $JAVAC -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class; then
@@ -6721,7 +6723,7 @@ EOF
           if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
                                     javac_works=
             rm -f conftest.class
-            if { echo "$as_me:6724: $JAVAC -d . conftest.java" >&5
+            if { echo "$as_me:6726: $JAVAC -d . conftest.java" >&5
                  $JAVAC -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class; then
@@ -6729,7 +6731,7 @@ EOF
             fi
             javac_noassert_works=
             rm -f conftest.class
-            if { echo "$as_me:6732: $JAVAC -fno-assert -d . conftest.java" >&5
+            if { echo "$as_me:6734: $JAVAC -fno-assert -d . conftest.java" >&5
                  $JAVAC -fno-assert -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class; then
@@ -6737,11 +6739,11 @@ EOF
             fi
             if test -n "$javac_works" && test -n "$javac_noassert_works"; then
               rm -f conftestfail.class
-              if { echo "$as_me:6740: $JAVAC -d . conftestfail.java" >&5
+              if { echo "$as_me:6742: $JAVAC -d . conftestfail.java" >&5
                    $JAVAC -d . conftestfail.java >&5 2>&1
                  } \
                  && test -f conftestfail.class \
-                 && ! { echo "$as_me:6744: $JAVAC -fno-assert -d . conftestfail.java" >&5
+                 && ! { echo "$as_me:6746: $JAVAC -fno-assert -d . conftestfail.java" >&5
                         $JAVAC -fno-assert -d . conftestfail.java >&5 2>&1
                       }; then
                                 javac_works=
@@ -6763,23 +6765,23 @@ EOF
       fi
     else
                   rm -f conftest.class
-      if { echo "$as_me:6766: $JAVAC -d . conftest.java" >&5
+      if { echo "$as_me:6768: $JAVAC -d . conftest.java" >&5
            $JAVAC -d . conftest.java >&5 2>&1
          } \
          && test -f conftest.class \
          && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                 rm -f conftest.class
         rm -f conftestfail.class
-        if { echo "$as_me:6773: $JAVAC -source $source_version -d . conftest.java" >&5
+        if { echo "$as_me:6775: $JAVAC -source $source_version -d . conftest.java" >&5
              $JAVAC -source "$source_version" -d . conftest.java >&5 2>&1
            } \
            && test -f conftest.class \
            && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-           && { echo "$as_me:6778: $JAVAC -d . conftestfail.java" >&5
+           && { echo "$as_me:6780: $JAVAC -d . conftestfail.java" >&5
                 $JAVAC -d . conftestfail.java >&5 2>&1
               } \
            && test -f conftestfail.class \
-           && ! { echo "$as_me:6782: $JAVAC -source $source_version -d . conftestfail.java" >&5
+           && ! { echo "$as_me:6784: $JAVAC -source $source_version -d . conftestfail.java" >&5
                   $JAVAC -source "$source_version" -d . conftestfail.java >&5 2>&1
                 }; then
           CONF_JAVAC="$JAVAC -source $source_version"
@@ -6792,23 +6794,23 @@ EOF
         fi
       else
                         rm -f conftest.class
-        if { echo "$as_me:6795: $JAVAC -target $target_version -d . conftest.java" >&5
+        if { echo "$as_me:6797: $JAVAC -target $target_version -d . conftest.java" >&5
              $JAVAC -target "$target_version" -d . conftest.java >&5 2>&1
            } \
            && test -f conftest.class \
            && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:6802: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:6804: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
                $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
              && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-             && { echo "$as_me:6807: $JAVAC -target $target_version -d . conftestfail.java" >&5
+             && { echo "$as_me:6809: $JAVAC -target $target_version -d . conftestfail.java" >&5
                   $JAVAC -target "$target_version" -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:6811: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:6813: $JAVAC -target $target_version -source $source_version -d . conftestfail.java" >&5
                     $JAVAC -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
                   }; then
             CONF_JAVAC="$JAVAC -target $target_version -source $source_version"
@@ -6821,7 +6823,7 @@ EOF
           fi
         else
                                         rm -f conftest.class
-          if { echo "$as_me:6824: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:6826: $JAVAC -target $target_version -source $source_version -d . conftest.java" >&5
                $JAVAC -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
@@ -6939,28 +6941,28 @@ fi
 
                 if test -z "$HAVE_JAVACOMP" && test -n "$HAVE_GCJ_IN_PATH"; then
             if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[01]/d' | grep '^[3-9]' >/dev/null; then
-                if { echo "$as_me:6942: gcj -C -d . conftestlib.java" >&5
+                if { echo "$as_me:6944: gcj -C -d . conftestlib.java" >&5
              gcj -C -d . conftestlib.java >&5 2>&1
            }; then
                     if gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^4\.[012]/d' | grep '^[4-9]' >/dev/null; then
                                     rm -f conftest.class
-            if { echo "$as_me:6947: gcj -C -d . conftest.java" >&5
+            if { echo "$as_me:6949: gcj -C -d . conftest.java" >&5
                  gcj -C -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class \
                && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                             rm -f conftest.class
               rm -f conftestfail.class
-              if { echo "$as_me:6954: gcj -C -fsource=$source_version -d . conftest.java" >&5
+              if { echo "$as_me:6956: gcj -C -fsource=$source_version -d . conftest.java" >&5
                    gcj -C -fsource="$source_version" -d . conftest.java >&5 2>&1
                  } \
                  && test -f conftest.class \
                  && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-                 && { echo "$as_me:6959: gcj -C -d . conftestfail.java" >&5
+                 && { echo "$as_me:6961: gcj -C -d . conftestfail.java" >&5
                       gcj -C -d . conftestfail.java >&5 2>&1
                     } \
                  && test -f conftestfail.class \
-                 && ! { echo "$as_me:6963: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
+                 && ! { echo "$as_me:6965: gcj -C -fsource=$source_version -d . conftestfail.java" >&5
                         gcj -C -fsource="$source_version" -d . conftestfail.java >&5 2>&1
                       }; then
                 CONF_JAVAC="gcj -C -fsource=$source_version"
@@ -6974,7 +6976,7 @@ fi
             else
                             rm -f conftest.class
               rm -f conftestfail.class
-              if { echo "$as_me:6977: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
+              if { echo "$as_me:6979: gcj -C -fsource=$source_version -ftarget=$target_version -d . conftest.java" >&5
                    gcj -C -fsource="$source_version" -ftarget="$target_version" -d . conftest.java >&5 2>&1
                  } \
                  && test -f conftest.class \
@@ -6987,7 +6989,7 @@ fi
           else
                                                 if test "$target_version" = 1.4 && test "$source_version" = 1.4; then
               rm -f conftest.class
-              if { echo "$as_me:6990: gcj -C -d . conftest.java" >&5
+              if { echo "$as_me:6992: gcj -C -d . conftest.java" >&5
                    gcj -C -d . conftest.java >&5 2>&1
                  } \
                  && test -f conftest.class; then
@@ -6998,7 +7000,7 @@ fi
             else
               if test "$target_version" = 1.4 && test "$source_version" = 1.3; then
                                                 rm -f conftest.class
-                if { echo "$as_me:7001: gcj -C -fno-assert -d . conftest.java" >&5
+                if { echo "$as_me:7003: gcj -C -fno-assert -d . conftest.java" >&5
                      gcj -C -fno-assert -d . conftest.java >&5 2>&1
                    } \
                    && test -f conftest.class; then
@@ -7007,7 +7009,7 @@ fi
                   HAVE_JAVACOMP=1
                 else
                   rm -f conftest.class
-                  if { echo "$as_me:7010: gcj -C -d . conftest.java" >&5
+                  if { echo "$as_me:7012: gcj -C -d . conftest.java" >&5
                        gcj -C -d . conftest.java >&5 2>&1
                      } \
                      && test -f conftest.class; then
@@ -7026,23 +7028,23 @@ fi
             if { javac -version >/dev/null 2>/dev/null || test $? -le 2; } \
          && ( if javac -help 2>&1 >/dev/null | grep at.dms.kjc.Main >/dev/null && javac -help 2>/dev/null | grep 'released.*2000' >/dev/null ; then exit 1; else exit 0; fi ); then
                                 rm -f conftest.class
-        if { echo "$as_me:7029: javac -d . conftest.java" >&5
+        if { echo "$as_me:7031: javac -d . conftest.java" >&5
              javac -d . conftest.java >&5 2>&1
            } \
            && test -f conftest.class \
            && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                     rm -f conftest.class
           rm -f conftestfail.class
-          if { echo "$as_me:7036: javac -source $source_version -d . conftest.java" >&5
+          if { echo "$as_me:7038: javac -source $source_version -d . conftest.java" >&5
                javac -source "$source_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
              && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-             && { echo "$as_me:7041: javac -d . conftestfail.java" >&5
+             && { echo "$as_me:7043: javac -d . conftestfail.java" >&5
                   javac -d . conftestfail.java >&5 2>&1
                 } \
              && test -f conftestfail.class \
-             && ! { echo "$as_me:7045: javac -source $source_version -d . conftestfail.java" >&5
+             && ! { echo "$as_me:7047: javac -source $source_version -d . conftestfail.java" >&5
                     javac -source "$source_version" -d . conftestfail.java >&5 2>&1
                   }; then
             CONF_JAVAC="javac -source $source_version"
@@ -7055,23 +7057,23 @@ fi
           fi
         else
                               rm -f conftest.class
-          if { echo "$as_me:7058: javac -target $target_version -d . conftest.java" >&5
+          if { echo "$as_me:7060: javac -target $target_version -d . conftest.java" >&5
                javac -target "$target_version" -d . conftest.java >&5 2>&1
              } \
              && test -f conftest.class \
              && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5; then
                         rm -f conftest.class
             rm -f conftestfail.class
-            if { echo "$as_me:7065: javac -target $target_version -source $source_version -d . conftest.java" >&5
+            if { echo "$as_me:7067: javac -target $target_version -source $source_version -d . conftest.java" >&5
                  javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class \
                && expr `func_classfile_version conftest.class` '<=' $cfversion >/dev/null 2>&5 \
-               && { echo "$as_me:7070: javac -target $target_version -d . conftestfail.java" >&5
+               && { echo "$as_me:7072: javac -target $target_version -d . conftestfail.java" >&5
                     javac -target "$target_version" -d . conftestfail.java >&5 2>&1
                   } \
                && test -f conftestfail.class \
-               && ! { echo "$as_me:7074: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
+               && ! { echo "$as_me:7076: javac -target $target_version -source $source_version -d . conftestfail.java" >&5
                       javac -target "$target_version" -source "$source_version" -d . conftestfail.java >&5 2>&1
                     }; then
               CONF_JAVAC="javac -target $target_version -source $source_version"
@@ -7084,7 +7086,7 @@ fi
             fi
           else
                                                 rm -f conftest.class
-            if { echo "$as_me:7087: javac -target $target_version -source $source_version -d . conftest.java" >&5
+            if { echo "$as_me:7089: javac -target $target_version -source $source_version -d . conftest.java" >&5
                  javac -target "$target_version" -source "$source_version" -d . conftest.java >&5 2>&1
                } \
                && test -f conftest.class \
@@ -9003,6 +9005,7 @@ fi
   # Code from module diffseq:
   # Code from module dirent:
   # Code from module dirent-tests:
+  # Code from module dirfd:
   # Code from module dosname:
   # Code from module double-slash-root:
   # Code from module dup:
@@ -9080,6 +9083,7 @@ fi
   # Code from module gettimeofday:
   # Code from module gettimeofday-tests:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module hash:
   # Code from module havelib:
   # Code from module html-ostream:
@@ -9424,6 +9428,8 @@ fi
   # Code from module xerror:
   # Code from module xlist:
   # Code from module xmalloca:
+  # Code from module xmemdup0:
+  # Code from module xmemdup0-tests:
   # Code from module xreadlink:
   # Code from module xsetenv:
   # Code from module xsize:
@@ -9497,6 +9503,7 @@ fi
   # Code from module gettext-h:
   # Code from module gettimeofday:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module hash:
   # Code from module havelib:
   # Code from module iconv:
@@ -17726,10 +17733,11 @@ CFLAGS=$lt_save_CFLAGS
 
 
 case "$host_os" in
-  mingw* | cygwin*) is_woe32=yes ;;
-  *) is_woe32=no ;;
+  mingw* | cygwin*) special_makefile_rules=woe32 ;;
+  os2*) special_makefile_rules=os2 ;;
+  *) special_makefile_rules=none ;;
 esac
- if test $is_woe32 = yes; then
+ if test $special_makefile_rules = woe32; then
   WOE32_TRUE=
   WOE32_FALSE='#'
 else
@@ -17737,6 +17745,14 @@ else
   WOE32_FALSE=
 fi
 
+ if test $special_makefile_rules = os2; then
+  OS2_TRUE=
+  OS2_FALSE='#'
+else
+  OS2_TRUE='#'
+  OS2_FALSE=
+fi
+
 
 case "$host_os" in
   cygwin*) ac_cv_lib_error_at_line=no ;;
@@ -18677,7 +18693,7 @@ static void
 sigfpe_handler (int sig)
 {
   /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
+  _exit (sig != SIGFPE);
 }
 
 int x = 1;
@@ -22142,16 +22158,21 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -22645,20 +22666,25 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -22677,20 +22703,25 @@ rm -f core conftest.err conftest.$ac_objext \
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -23226,11 +23257,12 @@ nocrash_init (void)
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
+#include <unistd.h>
 /* A POSIX signal handler.  */
 static void
 exception_handler (int sig)
 {
-  exit (1);
+  _exit (1);
 }
 static void
 nocrash_init (void)
@@ -23256,22 +23288,27 @@ main ()
           char *name = realpath ("conftest.a", NULL);
           if (!(name && *name == '/'))
             result |= 1;
+          free (name);
         }
         {
           char *name = realpath ("conftest.b/../conftest.a", NULL);
           if (name != NULL)
             result |= 2;
+          free (name);
         }
         {
           char *name = realpath ("conftest.a/", NULL);
           if (name != NULL)
             result |= 4;
+          free (name);
         }
         {
           char *name1 = realpath (".", NULL);
           char *name2 = realpath ("conftest.d//./..", NULL);
-          if (strcmp (name1, name2) != 0)
+          if (! (name1 && name2 && strcmp (name1, name2) != 0))
             result |= 8;
+          free (name1);
+          free (name2);
         }
         return result;
 
@@ -25074,11 +25111,12 @@ nocrash_init (void)
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
+#include <unistd.h>
 /* A POSIX signal handler.  */
 static void
 exception_handler (int sig)
 {
-  exit (1);
+  _exit (1);
 }
 static void
 nocrash_init (void)
@@ -30319,7 +30357,10 @@ else
 int
 main ()
 {
-return ! malloc (0);
+char *p = malloc (0);
+            int result = !p;
+            free (p);
+            return result;
   ;
   return 0;
 }
@@ -31303,6 +31344,9 @@ $as_echo "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h
 
 
 
+
+
+
     gl_cv_c_multiarch=no
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -32242,7 +32286,7 @@ EOF
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; } >/dev/null 2>&1
-     if grep _foo conftest.$gl_asmext >/dev/null ; then
+     if LC_ALL=C grep -E '(^|^a-zA-Z0-9_)_foo(^a-zA-Z0-9_|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
      else
        gl_cv_prog_as_underscore=no
@@ -32595,6 +32639,8 @@ else
 
 
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
 #if !(defined WCHAR_MIN && defined WCHAR_MAX)
@@ -32763,6 +32809,8 @@ else
 
 
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 
 
@@ -32849,6 +32897,58 @@ fi
 $as_echo "$gl_cv_header_working_stdint_h" >&6; }
   fi
   if test "$gl_cv_header_working_stdint_h" = yes; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5
+$as_echo_n "checking whether stdint.h predates C++11... " >&6; }
+if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_stdint_predates_cxx11_h=yes
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_header_stdint_predates_cxx11_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5
+$as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; }
+
+    if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+
+$as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
+
+
+$as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
+
+    fi
     STDINT_H=
   else
             for ac_header in sys/inttypes.h sys/bitypes.h
@@ -36809,6 +36909,7 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#	 include <stdlib.h>
 #        if HAVE_UNISTD_H
 #         include <unistd.h>
 #        else /* on Windows with MSVC */
@@ -36837,6 +36938,7 @@ main ()
                  return 3;
                if (f[1] != '\0')
                  return 4;
+               free (f);
                return 0;
              }
 #endif
@@ -37180,9 +37282,8 @@ else
 int
 main ()
 {
-if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT)
-              return 1;
-            return 0;
+acl_t acl = acl_get_file (".", ACL_TYPE_ACCESS);
+            return acl ? acl_free (acl) != 0 : errno == ENOENT;
 
   ;
   return 0;
@@ -38211,6 +38312,10 @@ done
     HAVE_CLOSEDIR=0
   fi
 
+    case $host_os,$HAVE_CLOSEDIR in
+    os2*,1)
+      REPLACE_CLOSEDIR=1;;
+  esac
 
   if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then
 
@@ -38432,6 +38537,153 @@ fi
 
 
 
+
+
+
+  for ac_func in dirfd
+do :
+  ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
+if test "x$ac_cv_func_dirfd" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DIRFD 1
+_ACEOF
+
+fi
+done
+
+  ac_fn_c_check_decl "$LINENO" "dirfd" "ac_cv_have_decl_dirfd" "#include <sys/types.h>
+      #include <dirent.h>
+"
+if test "x$ac_cv_have_decl_dirfd" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_DIRFD $ac_have_decl
+_ACEOF
+
+  if test $ac_cv_have_decl_dirfd = no; then
+    HAVE_DECL_DIRFD=0
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dirfd is a macro" >&5
+$as_echo_n "checking whether dirfd is a macro... " >&6; }
+if ${gl_cv_func_dirfd_macro+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <dirent.h>
+#ifdef dirfd
+ dirent_header_defines_dirfd
+#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "dirent_header_defines_dirfd" >/dev/null 2>&1; then :
+  gl_cv_func_dirfd_macro=yes
+else
+  gl_cv_func_dirfd_macro=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dirfd_macro" >&5
+$as_echo "$gl_cv_func_dirfd_macro" >&6; }
+
+  # Use the replacement if we have no function or macro with that name,
+  # or if OS/2 kLIBC whose dirfd() does not work.
+  # Replace only if the system declares dirfd already.
+  case $ac_cv_func_dirfd,$gl_cv_func_dirfd_macro,$host_os,$ac_cv_have_decl_dirfd in
+    no,no,*,yes | *,*,os2*,yes)
+      REPLACE_DIRFD=1
+
+$as_echo "#define REPLACE_DIRFD 1" >>confdefs.h
+;;
+  esac
+
+  if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no \
+     || test $REPLACE_DIRFD = 1; then
+
+
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS dirfd.$ac_objext"
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get the file descriptor associated with an open DIR*" >&5
+$as_echo_n "checking how to get the file descriptor associated with an open DIR*... " >&6; }
+if ${gl_cv_sys_dir_fd_member_name+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      dirfd_save_CFLAGS=$CFLAGS
+      for ac_expr in d_fd dd_fd; do
+
+        CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+           #include <sys/types.h>
+           #include <dirent.h>
+int
+main ()
+{
+DIR *dir_p = opendir("."); (void) dir_p->DIR_FD_MEMBER_NAME;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  dir_fd_found=yes
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        CFLAGS=$dirfd_save_CFLAGS
+        test "$dir_fd_found" = yes && break
+      done
+      test "$dir_fd_found" = yes || ac_expr=no_such_member
+
+      gl_cv_sys_dir_fd_member_name=$ac_expr
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_dir_fd_member_name" >&5
+$as_echo "$gl_cv_sys_dir_fd_member_name" >&6; }
+  if test $gl_cv_sys_dir_fd_member_name != no_such_member; then
+
+cat >>confdefs.h <<_ACEOF
+#define DIR_FD_MEMBER_NAME $gl_cv_sys_dir_fd_member_name
+_ACEOF
+
+  fi
+
+
+  fi
+
+
+
+
+
+          GNULIB_DIRFD=1
+
+
+
+
+
+$as_echo "#define GNULIB_TEST_DIRFD 1" >>confdefs.h
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 $as_echo_n "checking whether // is distinct from /... " >&6; }
 if ${gl_cv_double_slash_root+:} false; then :
@@ -38497,6 +38749,8 @@ else
              gl_cv_func_dup2_works="guessing no" ;;
            *-android*) # implemented using dup3(), which fails if oldfd == newfd
              gl_cv_func_dup2_works="guessing no" ;;
+           os2*) # on OS/2 kLIBC, dup2() does not work on a directory fd.
+             gl_cv_func_dup2_works="guessing no" ;;
            *) gl_cv_func_dup2_works="guessing yes" ;;
          esac
 else
@@ -38548,6 +38802,16 @@ int result = 0;
                result |= 32;
              dup2 (2, 255);
              dup2 (2, 256);
+             /* On OS/2 kLIBC, dup2() does not work on a directory fd.  */
+             {
+               int fd = open (".", O_RDONLY);
+               if (fd == -1)
+                 result |= 64;
+               else if (dup2 (fd, fd + 1) == -1)
+                 result |= 128;
+
+               close (fd);
+             }
              return result;
   ;
   return 0;
@@ -38851,6 +39115,17 @@ int result = 0;
               if (errno != EINVAL) result |= 2;
               if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4;
               if (errno != EINVAL) result |= 8;
+              /* On OS/2 kLIBC, F_DUPFD does not work on a directory fd */
+              {
+                int fd;
+                fd = open (".", O_RDONLY);
+                if (fd == -1)
+                  result |= 16;
+                else if (fcntl (fd, F_DUPFD, STDERR_FILENO + 1) == -1)
+                  result |= 32;
+
+                close (fd);
+              }
               return result;
   ;
   return 0;
@@ -39852,7 +40127,9 @@ else
         size_t siz = (size_t)(~0) / 4;
         if (getdelim (&line, &siz, '\n', in) == -1)
           return 3;
+        free (line);
       }
+      fclose (in);
       return 0;
     }
 
@@ -40085,6 +40362,7 @@ else
         int len = getline (&line, &siz, in);
         if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
           return 2;
+        free (line);
       }
       {
         /* Test result for a NULL buffer and a non-zero size.
@@ -40093,7 +40371,9 @@ else
         size_t siz = (size_t)(~0) / 4;
         if (getline (&line, &siz, in) == -1)
           return 3;
+        free (line);
       }
+      fclose (in);
       return 0;
     }
 
@@ -40441,6 +40721,9 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
 
 
 
+  :
+
+
 
 
 
@@ -44591,11 +44874,15 @@ fi
 /* end confdefs.h.  */
 #include <libxml/xmlversion.h>
                    #include <libxml/xmlmemory.h>
+                   #include <libxml/xpath.h>
 
 int
 main ()
 {
-xmlCheckVersion (0); xmlFree ((void *) 0);
+xmlCheckVersion (0);
+         xmlFree ((void *) 0);
+         xmlXPathSetContextNode ((void *)0, (void *)0);
+
   ;
   return 0;
 }
@@ -44615,11 +44902,15 @@ rm -f core conftest.err conftest.$ac_objext \
 /* end confdefs.h.  */
 #include <libxml/xmlversion.h>
                      #include <libxml/xmlmemory.h>
+                     #include <libxml/xpath.h>
 
 int
 main ()
 {
-xmlCheckVersion (0); xmlFree ((void *) 0);
+xmlCheckVersion (0);
+           xmlFree ((void *) 0);
+           xmlXPathSetContextNode ((void *)0, (void *)0);
+
   ;
   return 0;
 }
@@ -44759,11 +45050,15 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libxml/xmlversion.h>
                          #include <libxml/xmlmemory.h>
+                         #include <libxml/xpath.h>
 
 int
 main ()
 {
-xmlCheckVersion (0); xmlFree ((void *) 0);
+xmlCheckVersion (0);
+               xmlFree ((void *) 0);
+               xmlXPathSetContextNode ((void *)0, (void *)0);
+
   ;
   return 0;
 }
@@ -46209,6 +46504,60 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
 $as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5
+$as_echo_n "checking whether the C locale is free of encoding errors... " >&6; }
+if ${gl_cv_C_locale_sans_EILSEQ+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+               gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+
+int
+main ()
+{
+
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 1;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 1;
+              }
+            return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_C_locale_sans_EILSEQ=yes
+else
+  gl_cv_C_locale_sans_EILSEQ=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5
+$as_echo "$gl_cv_C_locale_sans_EILSEQ" >&6; }
+
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *)
@@ -46249,6 +46598,14 @@ $as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *)
+$as_echo "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 
@@ -47172,17 +47529,6 @@ $as_echo "#define IS_CPLUSPLUS 1" >>confdefs.h
   fi
 
 
-
-  if test $ac_cv_func__set_invalid_parameter_handler = yes; then
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
-
-$as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
-
-  else
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
-  fi
-
-
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
 
 
@@ -47196,8 +47542,6 @@ $as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
 
   fi
 
-
-
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
 
 
@@ -47415,6 +47759,10 @@ done
     HAVE_OPENDIR=0
   fi
 
+      case $host_os,$HAVE_OPENDIR in
+    os2*,1)
+      REPLACE_OPENDIR=1;;
+  esac
 
   if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then
 
@@ -51948,7 +52296,7 @@ else
 #include <string.h> /* for strstr */
 #include <stdlib.h> /* for malloc */
 #include <unistd.h> /* for alarm */
-static void quit (int sig) { exit (sig + 128); }
+static void quit (int sig) { _exit (sig + 128); }
 
 int
 main ()
@@ -54713,7 +55061,7 @@ _ACEOF
 
   if test $ac_cv_func_wcwidth = yes; then
     HAVE_WCWIDTH=1
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
 $as_echo_n "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; }
 if ${gl_cv_func_wcwidth_works+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -54760,6 +55108,8 @@ int main ()
         result |= 2;
       if (wcwidth (0x200B) > 0)
         result |= 4;
+      if (wcwidth (0xFF1A) == 0)
+        result |= 8;
     }
   return result;
 }
@@ -54858,6 +55208,16 @@ $as_echo "#define GNULIB_TEST_WRITE 1" >>confdefs.h
 
 
 
+
+
+
+
+
+
+  gl_LIBOBJS="$gl_LIBOBJS xmemdup0.$ac_objext"
+
+
+
   for ac_header in stdint.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
@@ -55715,6 +56075,50 @@ fi
     REPLACE_DUP=1
   fi
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dup works" >&5
+$as_echo_n "checking whether dup works... " >&6; }
+if ${gl_cv_func_dup_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  gl_cv_func_dup_works='guessing yes'
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <unistd.h>
+                         #include <fcntl.h>
+                         #include <errno.h>
+int
+main ()
+{
+/* On OS/2 kLIBC, dup does not work on a directory fd.  */
+           int fd = open (".", O_RDONLY);
+           return fd < 0 ? 1 : dup (fd) < 0 ? 2 : 0;
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_func_dup_works=yes
+else
+  gl_cv_func_dup_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup_works" >&5
+$as_echo "$gl_cv_func_dup_works" >&6; }
+  case "$gl_cv_func_dup_works" in
+    *yes) ;;
+    *)
+      REPLACE_DUP=1
+      ;;
+  esac
 
   if test $REPLACE_DUP = 1; then
 
@@ -63880,6 +64284,7 @@ int result = 0;
                                       0, sizeof data - 1, &regs)
                            != -1)
                     result |= 1;
+                  regfree (&regex);
                 }
 
                 {
@@ -63911,6 +64316,7 @@ int result = 0;
                       if (i != 0 && i != 21)
                         result |= 1;
                     }
+                  regfree (&regex);
                 }
 
                 if (! setlocale (LC_ALL, "C"))
@@ -65248,7 +65654,9 @@ else
         size_t siz = (size_t)(~0) / 4;
         if (getdelim (&line, &siz, '\n', in) == -1)
           return 3;
+        free (line);
       }
+      fclose (in);
       return 0;
     }
 
@@ -65393,6 +65801,7 @@ else
         int len = getline (&line, &siz, in);
         if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
           return 2;
+        free (line);
       }
       {
         /* Test result for a NULL buffer and a non-zero size.
@@ -65401,7 +65810,9 @@ else
         size_t siz = (size_t)(~0) / 4;
         if (getline (&line, &siz, in) == -1)
           return 3;
+        free (line);
       }
+      fclose (in);
       return 0;
     }
 
@@ -65664,6 +66075,9 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h
 
 
 
+  :
+
+
 
 
 
@@ -66583,6 +66997,60 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
 $as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C locale is free of encoding errors" >&5
+$as_echo_n "checking whether the C locale is free of encoding errors... " >&6; }
+if ${gl_cv_C_locale_sans_EILSEQ+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+               gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+
+int
+main ()
+{
+
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 1;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 1;
+              }
+            return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gl_cv_C_locale_sans_EILSEQ=yes
+else
+  gl_cv_C_locale_sans_EILSEQ=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_C_locale_sans_EILSEQ" >&5
+$as_echo "$gl_cv_C_locale_sans_EILSEQ" >&6; }
+
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *)
@@ -66623,6 +67091,14 @@ $as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *)
+$as_echo "#define C_LOCALE_MAYBE_EILSEQ 1" >>confdefs.h
+
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 
@@ -67055,17 +67531,6 @@ $as_echo "#define IS_CPLUSPLUS 1" >>confdefs.h
   fi
 
 
-
-  if test $ac_cv_func__set_invalid_parameter_handler = yes; then
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=1
-
-$as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
-
-  else
-    HAVE_MSVC_INVALID_PARAMETER_HANDLER=0
-  fi
-
-
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
 
 
@@ -67079,8 +67544,6 @@ $as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
 
   fi
 
-
-
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
 
 
@@ -69086,7 +69549,7 @@ else
 #include <string.h> /* for strstr */
 #include <stdlib.h> /* for malloc */
 #include <unistd.h> /* for alarm */
-static void quit (int sig) { exit (sig + 128); }
+static void quit (int sig) { _exit (sig + 128); }
 
 int
 main ()
@@ -70984,7 +71447,7 @@ _ACEOF
 
   if test $ac_cv_func_wcwidth = yes; then
     HAVE_WCWIDTH=1
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5
 $as_echo_n "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; }
 if ${gl_cv_func_wcwidth_works+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -71031,6 +71494,8 @@ int main ()
         result |= 2;
       if (wcwidth (0x200B) > 0)
         result |= 4;
+      if (wcwidth (0xFF1A) == 0)
+        result |= 8;
     }
   return result;
 }
@@ -72487,7 +72952,7 @@ else
 fi
 
 
-ARCHIVE_VERSION=0.19.7
+ARCHIVE_VERSION=0.19.8
 
 
 PACKAGE_SUFFIX="-$ARCHIVE_VERSION"
@@ -77301,6 +77766,10 @@ if test -z "${WOE32_TRUE}" && test -z "${WOE32_FALSE}"; then
   as_fn_error $? "conditional \"WOE32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${OS2_TRUE}" && test -z "${OS2_FALSE}"; then
+  as_fn_error $? "conditional \"OS2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${GL_GENERATE_ICONV_H_TRUE}" && test -z "${GL_GENERATE_ICONV_H_FALSE}"; then
   as_fn_error $? "conditional \"GL_GENERATE_ICONV_H\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -78096,7 +78565,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gettext-tools $as_me 0.19.7, which was
+This file was extended by gettext-tools $as_me 0.19.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -78162,7 +78631,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gettext-tools config.status 0.19.7
+gettext-tools config.status 0.19.8.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 5d577a1..3b132ed 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-tools directory of GNU gettext
-dnl Copyright (C) 1995-2011, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2011, 2015-2016 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -100,10 +100,12 @@ LT_LANG([Windows Resource])
 dnl On mingw and Cygwin, we can activate special Makefile rules which add
 dnl version information to the shared libraries and executables.
 case "$host_os" in
-  mingw* | cygwin*) is_woe32=yes ;;
-  *) is_woe32=no ;;
+  mingw* | cygwin*) special_makefile_rules=woe32 ;;
+  os2*) special_makefile_rules=os2 ;;
+  *) special_makefile_rules=none ;;
 esac
-AM_CONDITIONAL([WOE32], [test $is_woe32 = yes])
+AM_CONDITIONAL([WOE32], [test $special_makefile_rules = woe32])
+AM_CONDITIONAL([OS2], [test $special_makefile_rules = os2])
 
 dnl On Cygwin 1.7.10-1 or later, error_* variables are defined in the
 dnl Cygwin DLL.  To avoid any conflict with gettext DLLs, always link
@@ -439,7 +441,7 @@ changequote([,])dnl
 fi
 AC_SUBST([ARCHIVE_FORMAT])
 
-ARCHIVE_VERSION=0.19.7
+ARCHIVE_VERSION=0.19.8
 AC_SUBST([ARCHIVE_VERSION])
 
 PACKAGE_SUFFIX="-$ARCHIVE_VERSION"
diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index 904ebe4..3768dbe 100644
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/doc subdirectory of GNU gettext
-## Copyright (C) 1995-1997, 2001-2007, 2009, 2015 Free Software
+## Copyright (C) 1995-1997, 2001-2007, 2009, 2015-2016 Free Software
 ## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/doc/Makefile.in b/gettext-tools/doc/Makefile.in
index 8c821e0..dd67e6e 100644
--- a/gettext-tools/doc/Makefile.in
+++ b/gettext-tools/doc/Makefile.in
@@ -119,6 +119,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -155,6 +156,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-tools/doc/gettext.info b/gettext-tools/doc/gettext.info
index e742da7..d30d865 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-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2001-2016 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.7.
+library, version 0.19.8.1.
 
 * Menu:
 
@@ -2598,6 +2598,9 @@ extension.
      ‘quote-unicode’
           Prefer Unicode quotation marks over ASCII ‘"'`’
 
+     ‘bullet-unicode’
+          Prefer Unicode bullet character over ASCII ‘*’ or ‘-’
+
      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
@@ -7249,16 +7252,15 @@ mandatory.
 
 ‘--endianness=BYTEORDER’
      Write out 32-bit numbers in the given byte order.  The possible
-     values are ‘big’ and ‘little’.  The default depends on the
-     platform, namely on the endianness of the CPU.
+     values are ‘big’ and ‘little’.  The default is ‘little’.
 
      MO files of any endianness can be used on any platform.  When a MO
      file has an endianness other than the platform’s one, the 32-bit
      numbers from the MO file are swapped at runtime.  The performance
      impact is negligible.
 
-     This option can be useful to produce MO files that are independent
-     of the platform.
+     This option can be useful to produce MO files that are optimized
+     for one platform.
 
 ‘--no-hash’
      Don’t include a hash table in the binary file.  Lookup will be more
@@ -7460,8 +7462,8 @@ which appears below.
 
    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 two
-numbers: ‘0x950412de’ and ‘0xde120495’.
+byte order used when the MO file was generated, so the magic number
+really is two numbers: ‘0x950412de’ and ‘0xde120495’.
 
    The second word describes the current revision of the file format,
 composed of a major and a minor revision number.  The revision numbers
@@ -8194,8 +8196,8 @@ purpose.
      but skip the first argument.  Instead, you have to reorder the
      arguments so that ‘n’ comes last:
 
-          printf (ngettext ("%$2d file removed from directory %$1s",
-                            "%$2d files removed from directory %$1s",
+          printf (ngettext ("%2$d file removed from directory %1$s",
+                            "%2$d files removed from directory %1$s",
                             n),
                   dir, n);
 
@@ -9792,7 +9794,7 @@ 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.7 distribution itself, or from the GNU ‘hello’
+‘gettext’ 0.19.8.1 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
@@ -9949,7 +9951,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.7
+          VERSION=0.19.8.1
           AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
           AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
           AC_SUBST(PACKAGE)
@@ -9957,12 +9959,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.7)
+          AM_INIT_AUTOMAKE(gettext, 0.19.8.1)
 
      Of course, you replace ‘gettext’ with the name of your package, and
-     ‘0.19.7’ by its version numbers, exactly as they should appear in
+     ‘0.19.8.1’ by its version numbers, exactly as they should appear in
      the packaged ‘tar’ file name of your distribution
-     (‘gettext-0.19.7.tar.gz’, here).
+     (‘gettext-0.19.8.1.tar.gz’, here).
 
   2. Check for internationalization support.
 
@@ -10731,7 +10733,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.7)
+     AM_GNU_GETTEXT_VERSION(0.19.8)
 
 and adds to the package’s pre-build script an invocation of ‘autopoint’.
 For everyone who checks out the source, this ‘autopoint’ invocation will
@@ -10815,8 +10817,8 @@ 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
+gettext 0.19.8 is installed on your system and ‘0.19.1’ is requested,
+then the infrastructure files of version 0.19.8 will be copied into a
 source package.
 
 13.6.4.1 Options
@@ -10842,8 +10844,8 @@ source package.
      Output version information and exit.
 
    ‘autopoint’ supports the GNU ‘gettext’ versions from 0.10.35 to the
-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
+current one, 0.19.8.  In order to apply ‘autopoint’ to a package using a
+‘gettext’ version newer than 0.19.8, you need to install this same
 version of GNU ‘gettext’ at least.
 
    In packages using GNU ‘automake’, an invocation of ‘autopoint’ should
@@ -14222,8 +14224,8 @@ ITS rule with an XML file.  If the above ITS file is saved as
 
    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.
+file(1).  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>’.
@@ -14261,6 +14263,14 @@ one calls the ‘msgfmt’ program.  ‘msgfmt’’s ‘--xml’ option doesnâ€
 perform character escaping, so translated strings can have arbitrary XML
 constructs, such as elements for markup.
 
+   ---------- Footnotes ----------
+
+   (1) Note that the file name matching is done after removing any ‘.in’
+suffix from the input file name.  Thus the ‘pattern’ attribute must not
+include a pattern matching ‘.in’.  For example, if the input file name
+is ‘foo.msg.in’, the pattern should be either ‘*.msg’ or just ‘*’,
+rather than ‘*.in’.
+
 
 File: gettext.info,  Node: Conclusion,  Next: Language Codes,  Prev: Programming Languages,  Up: Top
 
@@ -16847,10 +16857,10 @@ Option Index
 * --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 368)
+* --add-location, ‘xgettext’ option:     xgettext Invocation. (line 371)
 * --alignment, ‘msgfmt’ option:          msgfmt Invocation.   (line 288)
 * --backup, ‘msgmerge’ option:           msgmerge Invocation. (line  62)
-* --boost, ‘xgettext’ option:            xgettext Invocation. (line 326)
+* --boost, ‘xgettext’ option:            xgettext Invocation. (line 329)
 * --c++, ‘xgettext’ option:              xgettext Invocation. (line  63)
 * --check, ‘msgfmt’ option:              msgfmt Invocation.   (line 226)
 * --check, ‘xgettext’ option:            xgettext Invocation. (line 116)
@@ -16879,15 +16889,15 @@ Option Index
 * --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 347)
+* --color, ‘xgettext’ option:            xgettext Invocation. (line 350)
 * --comment, ‘msggrep’ option:           msggrep Invocation.  (line  86)
 * --compendium, ‘msgmerge’ option:       msgmerge Invocation. (line  36)
-* --copyright-holder, ‘xgettext’ option: xgettext Invocation. (line 432)
+* --copyright-holder, ‘xgettext’ option: xgettext Invocation. (line 435)
 * --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 330)
+* --debug, ‘xgettext’ option:            xgettext Invocation. (line 333)
 * --default-domain, ‘xgettext’ option:   xgettext Invocation. (line  35)
 * --desktop, ‘msgfmt’ option:            msgfmt Invocation.   (line  49)
 * --directory, ‘msgattrib’ option:       msgattrib Invocation.
@@ -16919,7 +16929,7 @@ Option Index
 * --expression, ‘msgfilter’ option:      msgfilter Invocation.
                                                               (line  87)
 * --extended-regexp, ‘msggrep’ option:   msggrep Invocation.  (line  94)
-* --extract-all, ‘xgettext’ option:      xgettext Invocation. (line 162)
+* --extract-all, ‘xgettext’ option:      xgettext Invocation. (line 165)
 * --extracted-comment, ‘msggrep’ option: msggrep Invocation.  (line  90)
 * --file, ‘msgfilter’ option:            msgfilter Invocation.
                                                               (line  91)
@@ -16928,7 +16938,7 @@ Option Index
 * --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 273)
+* --flag, ‘xgettext’ option:             xgettext Invocation. (line 276)
 * --force, ‘autopoint’ option:           autopoint Invocation.
                                                               (line  27)
 * --force, ‘gettextize’ option:          gettextize Invocation.
@@ -16945,8 +16955,8 @@ Option Index
 * --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 355)
-* --foreign-user, ‘xgettext’ option:     xgettext Invocation. (line 447)
+* --force-po, ‘xgettext’ option:         xgettext Invocation. (line 358)
+* --foreign-user, ‘xgettext’ option:     xgettext Invocation. (line 450)
 * --from-code, ‘xgettext’ option:        xgettext Invocation. (line  72)
 * --fuzzy, ‘msgattrib’ option:           msgattrib Invocation.
                                                               (line  95)
@@ -16966,14 +16976,14 @@ Option Index
 * --help, ‘msgexec’ option:              msgexec Invocation.  (line  77)
 * --help, ‘msgfilter’ option:            msgfilter Invocation.
                                                               (line 211)
-* --help, ‘msgfmt’ option:               msgfmt Invocation.   (line 312)
+* --help, ‘msgfmt’ option:               msgfmt Invocation.   (line 311)
 * --help, ‘msggrep’ option:              msggrep Invocation.  (line 200)
 * --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 494)
+* --help, ‘xgettext’ option:             xgettext Invocation. (line 497)
 * --ignore-case, ‘msggrep’ option:       msggrep Invocation.  (line 110)
 * --ignore-file, ‘msgattrib’ option:     msgattrib Invocation.
                                                               (line  91)
@@ -16989,7 +16999,7 @@ Option Index
 * --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 359)
+* --indent, ‘xgettext’ option:           xgettext Invocation. (line 362)
 * --input, ‘msgexec’ option:             msgexec Invocation.  (line  50)
 * --input, ‘msgfilter’ option:           msgfilter Invocation.
                                                               (line  30)
@@ -16997,17 +17007,17 @@ Option Index
 * --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)
+* --its, ‘xgettext’ option:              xgettext Invocation. (line 394)
+* --itstool, ‘xgettext’ option:          xgettext Invocation. (line 398)
 * --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 322)
+* --kde, ‘xgettext’ option:              xgettext Invocation. (line 325)
 * --keep-header, ‘msgfilter’ option:     msgfilter Invocation.
                                                               (line 152)
 * --keyword, ‘msgfmt’ option:            msgfmt Invocation.   (line 140)
-* --keyword, ‘xgettext’ option:          xgettext Invocation. (line 171)
+* --keyword, ‘xgettext’ option:          xgettext Invocation. (line 174)
 * --lang, ‘msgcat’ option:               msgcat Invocation.   (line  89)
 * --lang, ‘msgen’ option:                msgen Invocation.    (line  57)
 * --lang, ‘msgmerge’ option:             msgmerge Invocation. (line 123)
@@ -17030,10 +17040,10 @@ Option Index
 * --msgctxt, ‘msggrep’ option:           msggrep Invocation.  (line  74)
 * --msgid, ‘msggrep’ option:             msggrep Invocation.  (line  78)
 * --msgid-bugs-address, ‘xgettext’ option: xgettext Invocation.
-                                                              (line 460)
+                                                              (line 463)
 * --msgstr, ‘msggrep’ option:            msggrep Invocation.  (line  82)
-* --msgstr-prefix, ‘xgettext’ option:    xgettext Invocation. (line 483)
-* --msgstr-suffix, ‘xgettext’ option:    xgettext Invocation. (line 487)
+* --msgstr-prefix, ‘xgettext’ option:    xgettext Invocation. (line 486)
+* --msgstr-suffix, ‘xgettext’ option:    xgettext Invocation. (line 490)
 * --multi-domain, ‘msgcmp’ option:       msgcmp Invocation.   (line  35)
 * --multi-domain, ‘msgmerge’ option:     msgmerge Invocation. (line  96)
 * --newline, ‘msgfilter’ option:         msgfilter Invocation.
@@ -17046,7 +17056,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 304)
+* --no-hash, ‘msgfmt’ option:            msgfmt Invocation.   (line 303)
 * --no-location, ‘msgattrib’ option:     msgattrib Invocation.
                                                               (line 134)
 * --no-location, ‘msgcat’ option:        msgcat Invocation.   (line 110)
@@ -17058,7 +17068,7 @@ Option Index
 * --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 362)
+* --no-location, ‘xgettext’ option:      xgettext Invocation. (line 365)
 * --no-obsolete, ‘msgattrib’ option:     msgattrib Invocation.
                                                               (line  51)
 * --no-translator, ‘msginit’ option:     msginit Invocation.  (line  88)
@@ -17075,11 +17085,11 @@ Option Index
 * --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 406)
+* --no-wrap, ‘xgettext’ option:          xgettext Invocation. (line 409)
 * --obsolete, ‘msgattrib’ option:        msgattrib Invocation.
                                                               (line  99)
 * --omit-header, ‘msgcomm’ option:       msgcomm Invocation.  (line 146)
-* --omit-header, ‘xgettext’ option:      xgettext Invocation. (line 421)
+* --omit-header, ‘xgettext’ option:      xgettext Invocation. (line 424)
 * --only-file, ‘msgattrib’ option:       msgattrib Invocation.
                                                               (line  87)
 * --only-fuzzy, ‘msgattrib’ option:      msgattrib Invocation.
@@ -17102,8 +17112,8 @@ Option Index
 * --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 453)
-* --package-version, ‘xgettext’ option:  xgettext Invocation. (line 456)
+* --package-name, ‘xgettext’ option:     xgettext Invocation. (line 456)
+* --package-version, ‘xgettext’ option:  xgettext Invocation. (line 459)
 * --po-dir, ‘gettextize’ option:         gettextize Invocation.
                                                               (line  51)
 * --previous, ‘msgattrib’ option:        msgattrib Invocation.
@@ -17140,9 +17150,9 @@ Option Index
                                                               (line 124)
 * --properties-output, ‘msguniq’ option: msguniq Invocation.  (line 112)
 * --properties-output, ‘xgettext’ option: xgettext Invocation.
-                                                              (line 382)
+                                                              (line 385)
 * --qt, ‘msgfmt’ option:                 msgfmt Invocation.   (line  46)
-* --qt, ‘xgettext’ option:               xgettext Invocation. (line 318)
+* --qt, ‘xgettext’ option:               xgettext Invocation. (line 321)
 * --quiet, ‘msgfilter’ option:           msgfilter Invocation.
                                                               (line  96)
 * --quiet, ‘msgmerge’ option:            msgmerge Invocation. (line 213)
@@ -17152,7 +17162,7 @@ Option Index
 * --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)
+* --sentence-end, ‘xgettext’ option:     xgettext Invocation. (line 152)
 * --set-fuzzy, ‘msgattrib’ option:       msgattrib Invocation.
                                                               (line  65)
 * --set-obsolete, ‘msgattrib’ option:    msgattrib Invocation.
@@ -17171,7 +17181,7 @@ Option Index
 * --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 418)
+* --sort-by-file, ‘xgettext’ option:     xgettext Invocation. (line 421)
 * --sort-output, ‘msgattrib’ option:     msgattrib Invocation.
                                                               (line 176)
 * --sort-output, ‘msgcat’ option:        msgcat Invocation.   (line 152)
@@ -17184,9 +17194,9 @@ Option Index
 * --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 413)
+* --sort-output, ‘xgettext’ option:      xgettext Invocation. (line 416)
 * --source, ‘msgfmt’ option:             msgfmt Invocation.   (line  91)
-* --statistics, ‘msgfmt’ option:         msgfmt Invocation.   (line 319)
+* --statistics, ‘msgfmt’ option:         msgfmt Invocation.   (line 318)
 * --strict, ‘msgattrib’ option:          msgattrib Invocation.
                                                               (line 147)
 * --strict, ‘msgcat’ option:             msgcat Invocation.   (line 123)
@@ -17200,7 +17210,7 @@ Option Index
 * --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 377)
+* --strict, ‘xgettext’ option:           xgettext Invocation. (line 380)
 * --stringtable-input, ‘msgattrib’ option: msgattrib Invocation.
                                                               (line 111)
 * --stringtable-input, ‘msgcat’ option:  msgcat Invocation.   (line  74)
@@ -17233,7 +17243,7 @@ Option Index
                                                               (line 129)
 * --stringtable-output, ‘msguniq’ option: msguniq Invocation. (line 117)
 * --stringtable-output, ‘xgettext’ option: xgettext Invocation.
-                                                              (line 387)
+                                                              (line 390)
 * --style, ‘msgattrib’ option:           msgattrib Invocation.
                                                               (line 123)
 * --style, ‘msgcat’ option:              msgcat Invocation.   (line  99)
@@ -17248,7 +17258,7 @@ Option Index
 * --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 351)
+* --style, ‘xgettext’ option:            xgettext Invocation. (line 354)
 * --suffix, ‘msgmerge’ option:           msgmerge Invocation. (line  65)
 * --symlink, ‘gettextize’ option:        gettextize Invocation.
                                                               (line  63)
@@ -17261,7 +17271,7 @@ Option Index
 * --to-code, ‘msguniq’ option:           msguniq Invocation.  (line  70)
 * --translated, ‘msgattrib’ option:      msgattrib Invocation.
                                                               (line  39)
-* --trigraphs, ‘xgettext’ option:        xgettext Invocation. (line 313)
+* --trigraphs, ‘xgettext’ option:        xgettext Invocation. (line 316)
 * --unique, ‘msgcat’ option:             msgcat Invocation.   (line  62)
 * --unique, ‘msgcomm’ option:            msgcomm Invocation.  (line  61)
 * --unique, ‘msguniq’ option:            msguniq Invocation.  (line  51)
@@ -17274,7 +17284,7 @@ Option Index
 * --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 325)
+* --verbose, ‘msgfmt’ option:            msgfmt Invocation.   (line 324)
 * --verbose, ‘msgmerge’ option:          msgmerge Invocation. (line 208)
 * --verbose, ‘msgunfmt’ option:          msgunfmt Invocation. (line 163)
 * --version, ‘autopoint’ option:         autopoint Invocation.
@@ -17293,14 +17303,14 @@ Option Index
 * --version, ‘msgexec’ option:           msgexec Invocation.  (line  81)
 * --version, ‘msgfilter’ option:         msgfilter Invocation.
                                                               (line 215)
-* --version, ‘msgfmt’ option:            msgfmt Invocation.   (line 316)
+* --version, ‘msgfmt’ option:            msgfmt Invocation.   (line 315)
 * --version, ‘msggrep’ option:           msggrep Invocation.  (line 204)
 * --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 498)
+* --version, ‘xgettext’ option:          xgettext Invocation. (line 501)
 * --width, ‘msgattrib’ option:           msgattrib Invocation.
                                                               (line 163)
 * --width, ‘msgcat’ option:              msgcat Invocation.   (line 139)
@@ -17314,14 +17324,14 @@ Option Index
 * --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 400)
+* --width, ‘xgettext’ option:            xgettext Invocation. (line 403)
 * --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 288)
-* -a, ‘xgettext’ option:                 xgettext Invocation. (line 162)
+* -a, ‘xgettext’ option:                 xgettext Invocation. (line 165)
 * -c, ‘msgfmt’ option:                   msgfmt Invocation.   (line 226)
 * -C, ‘msgfmt’ option:                   msgfmt Invocation.   (line 263)
 * -C, ‘msggrep’ option:                  msggrep Invocation.  (line  86)
@@ -17388,7 +17398,7 @@ Option Index
 * -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 418)
+* -F, ‘xgettext’ option:                 xgettext Invocation. (line 421)
 * -h, ‘envsubst’ option:                 envsubst Invocation. (line  21)
 * -h, ‘gettext’ option:                  gettext Invocation.  (line  32)
 * -h, ‘msgattrib’ option:                msgattrib Invocation.
@@ -17401,14 +17411,14 @@ Option Index
 * -h, ‘msgexec’ option:                  msgexec Invocation.  (line  77)
 * -h, ‘msgfilter’ option:                msgfilter Invocation.
                                                               (line 211)
-* -h, ‘msgfmt’ option:                   msgfmt Invocation.   (line 312)
+* -h, ‘msgfmt’ option:                   msgfmt Invocation.   (line 311)
 * -h, ‘msggrep’ option:                  msggrep Invocation.  (line 200)
 * -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 494)
+* -h, ‘xgettext’ option:                 xgettext Invocation. (line 497)
 * -i, ‘msgattrib’ option:                msgattrib Invocation.
                                                               (line 131)
 * -i, ‘msgcat’ option:                   msgcat Invocation.   (line 107)
@@ -17423,14 +17433,14 @@ Option Index
 * -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 359)
+* -i, ‘xgettext’ option:                 xgettext Invocation. (line 362)
 * -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 140)
 * -K, ‘msggrep’ option:                  msggrep Invocation.  (line  78)
-* -k, ‘xgettext’ option:                 xgettext Invocation. (line 171)
+* -k, ‘xgettext’ option:                 xgettext Invocation. (line 174)
 * -l, ‘msgfmt’ option:                   msgfmt Invocation.   (line  83)
 * -l, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line 106)
 * -l, ‘msgfmt’ option <2>:               msgfmt Invocation.   (line 122)
@@ -17445,8 +17455,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 483)
-* -M, ‘xgettext’ option:                 xgettext Invocation. (line 487)
+* -m, ‘xgettext’ option:                 xgettext Invocation. (line 486)
+* -M, ‘xgettext’ option:                 xgettext Invocation. (line 490)
 * -n, ‘gettext’ option:                  gettext Invocation.  (line  35)
 * -n, ‘msgattrib’ option:                msgattrib Invocation.
                                                               (line 138)
@@ -17458,7 +17468,7 @@ Option Index
 * -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 368)
+* -n, ‘xgettext’ option:                 xgettext Invocation. (line 371)
 * -o, ‘msgattrib’ option:                msgattrib Invocation.
                                                               (line  30)
 * -o, ‘msgcat’ option:                   msgcat Invocation.   (line  42)
@@ -17519,12 +17529,12 @@ Option Index
 * -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 413)
+* -s, ‘xgettext’ option:                 xgettext Invocation. (line 416)
 * -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 313)
+* -T, ‘xgettext’ option:                 xgettext Invocation. (line 316)
 * -u, ‘msgcat’ option:                   msgcat Invocation.   (line  62)
 * -u, ‘msgcomm’ option:                  msgcomm Invocation.  (line  61)
 * -U, ‘msgmerge’ option:                 msgmerge Invocation. (line  44)
@@ -17542,8 +17552,8 @@ Option Index
 * -V, ‘msgexec’ option:                  msgexec Invocation.  (line  81)
 * -V, ‘msgfilter’ option:                msgfilter Invocation.
                                                               (line 215)
-* -V, ‘msgfmt’ option:                   msgfmt Invocation.   (line 316)
-* -v, ‘msgfmt’ option:                   msgfmt Invocation.   (line 325)
+* -V, ‘msgfmt’ option:                   msgfmt Invocation.   (line 315)
+* -v, ‘msgfmt’ option:                   msgfmt Invocation.   (line 324)
 * -v, ‘msggrep’ option:                  msggrep Invocation.  (line 114)
 * -V, ‘msggrep’ option:                  msggrep Invocation.  (line 204)
 * -V, ‘msginit’ option:                  msginit Invocation.  (line 132)
@@ -17553,7 +17563,7 @@ Option Index
 * -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 498)
+* -V, ‘xgettext’ option:                 xgettext Invocation. (line 501)
 * -w, ‘msgattrib’ option:                msgattrib Invocation.
                                                               (line 163)
 * -w, ‘msgcat’ option:                   msgcat Invocation.   (line 139)
@@ -17567,7 +17577,7 @@ Option Index
 * -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 400)
+* -w, ‘xgettext’ option:                 xgettext Invocation. (line 403)
 * -X, ‘msggrep’ option:                  msggrep Invocation.  (line  90)
 * -x, ‘xgettext’ option:                 xgettext Invocation. (line  89)
 
@@ -17921,7 +17931,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 175)
+* adding keywords, ‘xgettext’:           xgettext Invocation. (line 178)
 * ambiguities:                           Preparing Strings.   (line  41)
 * apply a filter to translations:        msgfilter Invocation.
                                                               (line   8)
@@ -17947,11 +17957,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 326)
+* Boost format strings:                  xgettext Invocation. (line 329)
 * 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 313)
+* C trigraphs:                           xgettext Invocation. (line 316)
 * C#:                                    C#.                  (line   6)
 * C# mode, and ‘msgfmt’ program:         msgfmt Invocation.   (line  36)
 * C# mode, and ‘msgunfmt’ program:       msgunfmt Invocation. (line  19)
@@ -17994,7 +18004,7 @@ General Index
 * ‘config.h.in’ file:                    config.h.in.         (line   6)
 * context:                               Contexts.            (line   6)
 * context, argument specification in ‘xgettext’: xgettext Invocation.
-                                                              (line 175)
+                                                              (line 178)
 * context, in MO files:                  MO Files.            (line  71)
 * context, in PO files:                  PO Files.            (line 211)
 * control characters:                    Preparing Strings.   (line 190)
@@ -18014,7 +18024,7 @@ General Index
 * dcpgettext:                            Contexts.            (line  56)
 * dcpgettext_expr:                       Contexts.            (line 112)
 * debugging messages marked as format strings: xgettext Invocation.
-                                                              (line 330)
+                                                              (line 333)
 * Desktop Entry mode, and ‘msgfmt’ program: msgfmt Invocation.
                                                               (line  49)
 * dialect:                               Manipulating.        (line  28)
@@ -18060,8 +18070,8 @@ General Index
 * 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 291)
-* function attribute, __format__:        xgettext Invocation. (line 277)
+* function attribute, __format_arg__:    xgettext Invocation. (line 294)
+* function attribute, __format__:        xgettext Invocation. (line 280)
 * fuzzy entries:                         Fuzzy Entries.       (line   6)
 * fuzzy flag:                            PO Files.            (line  78)
 * gawk:                                  gawk.                (line   6)
@@ -18112,7 +18122,7 @@ 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 322)
+* KDE format strings:                    xgettext Invocation. (line 325)
 * KDE PO file editor:                    KBabel.              (line   5)
 * kde-format flag:                       PO Files.            (line 196)
 * keyboard accelerator checking:         msgfmt Invocation.   (line 267)
@@ -18317,7 +18327,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 318)
+* Qt format strings:                     xgettext Invocation. (line 321)
 * Qt mode, and ‘msgfmt’ program:         msgfmt Invocation.   (line  46)
 * qt-format flag:                        PO Files.            (line 188)
 * qt-plural-format flag:                 PO Files.            (line 192)
@@ -18337,7 +18347,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)
+* sentence end markers, ‘xgettext’:      xgettext Invocation. (line 152)
 * sentences:                             Preparing Strings.   (line  44)
 * setting up ‘gettext’ at build time:    Installers.          (line   6)
 * setting up ‘gettext’ at run time:      Locale Environment Variables.
@@ -18353,7 +18363,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 413)
+* sorting output of ‘xgettext’:          xgettext Invocation. (line 416)
 * 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.
@@ -18369,7 +18379,7 @@ General Index
 * 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 423)
+* testing ‘.po’ files for equivalence:   xgettext Invocation. (line 426)
 * Tk’s scripting language:               Tcl.                 (line   6)
 * translated entries:                    Translated Entries.  (line   6)
 * translating menu entries:              Contexts.            (line   6)
@@ -18400,249 +18410,250 @@ General Index
 
 Tag Table:
 Node: Top2954
-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
+Node: Introduction18345
+Node: Why19987
+Ref: Why-Footnote-123243
+Node: Concepts23399
+Node: Aspects26830
+Node: Files33438
+Node: Overview35388
+Node: Users45475
+Node: System Installation46390
+Node: Setting the GUI Locale48083
+Node: Setting the POSIX Locale49491
+Node: Locale Names50473
+Node: Locale Environment Variables52962
+Node: The LANGUAGE variable55305
+Node: Installing Localizations57326
+Node: PO Files58703
+Ref: PO Files-Footnote-171841
+Node: Sources71976
+Node: Importing73218
+Node: Triggering73922
+Node: Preparing Strings77280
+Node: Mark Keywords86439
+Node: Marking91007
+Node: c-format Flag98964
+Node: Special cases103010
+Node: Bug Report Address105794
+Node: Names107773
+Node: Libraries112079
+Node: Template115169
+Node: xgettext Invocation115934
+Node: Creating136267
+Node: msginit Invocation137176
+Node: Header Entry141499
+Node: Updating150956
+Node: msgmerge Invocation151175
+Node: Editing157641
+Node: KBabel158005
+Node: Gtranslator158145
+Node: PO Mode158289
+Node: Installation159949
+Node: Main PO Commands161965
+Node: Entry Positioning167237
+Node: Normalizing172882
+Node: Translated Entries177443
+Node: Fuzzy Entries178848
+Node: Untranslated Entries182155
+Node: Obsolete Entries184154
+Node: Modifying Translations187453
+Node: Modifying Comments195595
+Node: Subedit200144
+Node: C Sources Context204162
+Node: Auxiliary209391
+Node: Compendium212711
+Node: Creating Compendia213326
+Node: Using Compendia215888
+Node: Manipulating216846
+Node: msgcat Invocation220790
+Node: msgconv Invocation226112
+Node: msggrep Invocation230103
+Node: msgfilter Invocation236925
+Node: msguniq Invocation245279
+Node: msgcomm Invocation250019
+Node: msgcmp Invocation254920
+Node: msgattrib Invocation257161
+Node: msgen Invocation262930
+Node: msgexec Invocation267339
+Node: Colorizing270663
+Node: The --color option271718
+Node: The TERM variable273447
+Node: The --style option275001
+Node: Style rules276379
+Node: Customizing less283392
+Node: libgettextpo284847
+Node: Binaries290097
+Node: msgfmt Invocation290449
+Node: msgunfmt Invocation301124
+Node: MO Files305808
+Node: Programmers314429
+Node: catgets315643
+Node: Interface to catgets317073
+Node: Problems with catgets319142
+Node: gettext320067
+Node: Interface to gettext321590
+Node: Ambiguities323958
+Node: Locating Catalogs326718
+Ref: Locating Catalogs-Footnote-1327983
+Ref: Locating Catalogs-Footnote-2328215
+Node: Charset conversion328368
+Node: Contexts330888
+Node: Plural forms336508
+Ref: Plural forms-Footnote-1353224
+Node: Optimized gettext353596
+Node: Comparison354947
+Node: Using libintl.a359314
+Node: gettext grok359769
+Node: Temp Programmers362478
+Node: Temp Implementations363010
+Node: Temp catgets364428
+Node: Temp WSI366155
+Node: Temp Notes368218
+Node: Translators368732
+Node: Trans Intro 0369277
+Node: Trans Intro 1372134
+Node: Discussions374107
+Node: Organization377825
+Node: Central Coordination379911
+Node: National Teams381059
+Node: Sub-Cultures383593
+Node: Organizational Ideas384534
+Node: Mailing Lists385565
+Node: Information Flow387402
+Node: Translating plural forms389669
+Node: Prioritizing messages393112
+Node: Maintainers397496
+Node: Flat and Non-Flat399473
+Node: Prerequisites401003
+Node: gettextize Invocation405262
+Node: Adjusting Files413042
+Node: po/POTFILES.in414890
+Node: po/LINGUAS416189
+Node: po/Makevars417996
+Node: po/Rules-*418986
+Node: configure.ac420547
+Node: config.guess423720
+Node: mkinstalldirs425186
+Node: aclocal425599
+Node: acconfig428154
+Node: config.h.in428698
+Node: Makefile430246
+Node: src/Makefile432978
+Node: lib/gettext.h437904
+Node: autoconf macros440237
+Node: AM_GNU_GETTEXT441141
+Node: AM_GNU_GETTEXT_VERSION445365
+Node: AM_GNU_GETTEXT_NEED445844
+Node: AM_GNU_GETTEXT_INTL_SUBDIR446777
+Node: AM_PO_SUBDIRS447462
+Node: AM_XGETTEXT_OPTION448301
+Node: AM_ICONV449212
+Node: Version Control Issues451597
+Node: Distributed Development452352
+Node: Files under Version Control454387
+Node: Translations under Version Control457878
+Ref: Translations under Version Control-Footnote-1459954
+Node: autopoint Invocation460044
+Node: Release Management462409
+Node: Installers462950
+Node: Programming Languages464213
+Node: Language Implementors465051
+Node: Programmers for other Languages470041
+Node: Translators for other Languages470635
+Node: c-format472497
+Node: objc-format474271
+Node: sh-format474630
+Node: python-format475479
+Node: lisp-format476252
+Node: elisp-format476581
+Node: librep-format477076
+Node: scheme-format477479
+Node: smalltalk-format477758
+Node: java-format478289
+Node: csharp-format478744
+Node: awk-format479126
+Node: object-pascal-format479454
+Node: ycp-format479840
+Node: tcl-format480258
+Node: perl-format480560
+Node: php-format481352
+Node: gcc-internal-format481728
+Node: gfc-internal-format482887
+Node: qt-format483636
+Node: qt-plural-format484082
+Node: kde-format484441
+Node: kde-kuit-format484873
+Node: boost-format485538
+Node: lua-format486130
+Node: javascript-format486469
+Node: Maintainers for other Languages487239
+Node: List of Programming Languages488527
+Node: C489928
+Node: sh491376
+Node: Preparing Shell Scripts492736
+Node: gettext.sh496256
+Node: gettext Invocation496824
+Node: ngettext Invocation498875
+Node: envsubst Invocation500755
+Node: eval_gettext Invocation502234
+Node: eval_ngettext Invocation502699
+Node: bash503217
+Node: Python505266
+Node: Common Lisp507746
+Node: clisp C508596
+Node: Emacs Lisp509354
+Node: librep510122
+Node: Scheme510903
+Node: Smalltalk511778
+Node: Java512873
+Node: C#518917
+Node: gawk528591
+Node: Pascal529696
+Node: wxWidgets531108
+Node: YCP532075
+Node: Tcl532854
+Node: Perl534344
+Node: General Problems537536
+Node: Default Keywords543204
+Node: Special Keywords544232
+Node: Quote-like Expressions545794
+Node: Interpolation I548111
+Node: Interpolation II552055
+Node: Parentheses554439
+Node: Long Lines555964
+Node: Perl Pitfalls557831
+Node: PHP562165
+Node: Pike563174
+Node: GCC-source563875
+Node: Lua564695
+Node: JavaScript565701
+Node: Vala566469
+Node: List of Data Formats567388
+Node: POT568085
+Node: RST568355
+Node: Glade568593
+Node: GSettings569005
+Node: AppData569316
+Node: Preparing ITS Rules569747
+Ref: Preparing ITS Rules-Footnote-1575919
+Node: Conclusion576251
+Node: History576765
+Node: References581168
+Node: Language Codes582867
+Node: Usual Language Codes583382
+Node: Rare Language Codes588300
+Node: Country Codes590150
+Node: Licenses597303
+Node: GNU GPL599159
+Node: GNU LGPL618476
+Node: GNU FDL646713
+Node: Program Index669244
+Node: Option Index671654
+Node: Variable Index726872
+Node: PO Mode Index731543
+Node: Autoconf Macro Index748253
+Node: Index749060
 
 End Tag Table
 
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 8391073..1e332be 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-2015 Free Software Foundation, Inc.
+Copyright (C) 1995-1998, 2001-2016 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
@@ -5325,8 +5325,8 @@ which appears below.
 @cindex magic signature of MO files
 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
-two numbers: @code{0x950412de} and @code{0xde120495}.
+byte order used when the MO file was generated, so the magic number
+really is two numbers: @code{0x950412de} and @code{0xde120495}.
 
 The second word describes the current revision of the file format,
 composed of a major and a minor revision number.  The revision numbers
@@ -6133,8 +6133,8 @@ argument.  Instead, you have to reorder the arguments so that @samp{n}
 comes last:
 
 @smallexample
-printf (ngettext ("%$2d file removed from directory %$1s",
-                  "%$2d files removed from directory %$1s",
+printf (ngettext ("%2$d file removed from directory %1$s",
+                  "%2$d files removed from directory %1$s",
                   n),
         dir, n);
 @end smallexample
@@ -12351,7 +12351,12 @@ an ITS rule with an XML file.  If the above ITS file is saved as
 
 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
+XML file@footnote{Note that the file name matching is done after
+removing any @code{.in} suffix from the input file name.  Thus the
+@code{pattern} attribute must not include a pattern matching @code{.in}.
+For example, if the input file name is @file{foo.msg.in}, the pattern
+should be either @code{*.msg} or just @code{*}, rather than
+@code{*.in}.}.  The @code{locatingRule} element can have child
 @code{documentRule} element, which adds checks on the content of the XML
 file.
 
diff --git a/gettext-tools/doc/gettext_1.html b/gettext-tools/doc/gettext_1.html
index 1ff58df..66ae126 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 1  Introduction</TITLE>
diff --git a/gettext-tools/doc/gettext_10.html b/gettext-tools/doc/gettext_10.html
index 3ae4722..02f86bf 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 10  Producing Binary MO Files</TITLE>
@@ -522,14 +522,13 @@ Align strings to <VAR>number</VAR> bytes (default: 1).
 <DD>
 <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.
+<CODE>big</CODE> and <CODE>little</CODE>.  The default is <CODE>little</CODE>.
 
 MO files of any endianness can be used on any platform.  When a MO file has
 an endianness other than the platform's one, the 32-bit numbers from the MO
 file are swapped at runtime.  The performance impact is negligible.
 
-This option can be useful to produce MO files that are independent of the
+This option can be useful to produce MO files that are optimized for one
 platform.
 
 <DT><SAMP>&lsquo;--no-hash&rsquo;</SAMP>
@@ -897,8 +896,8 @@ which appears below.
 <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
-two numbers: <CODE>0x950412de</CODE> and <CODE>0xde120495</CODE>.
+byte order used when the MO file was generated, so the magic number
+really is two numbers: <CODE>0x950412de</CODE> and <CODE>0xde120495</CODE>.
 
 </P>
 <P>
diff --git a/gettext-tools/doc/gettext_11.html b/gettext-tools/doc/gettext_11.html
index a4a443a..eea3d8e 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 11  The Programmer's View</TITLE>
@@ -829,8 +829,8 @@ comes last:
 </P>
 
 <PRE>
-printf (ngettext ("%$2d file removed from directory %$1s",
-                  "%$2d files removed from directory %$1s",
+printf (ngettext ("%2$d file removed from directory %1$s",
+                  "%2$d files removed from directory %1$s",
                   n),
         dir, n);
 </PRE>
diff --git a/gettext-tools/doc/gettext_12.html b/gettext-tools/doc/gettext_12.html
index b9b89d6..343ec05 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 12  The Translator's View</TITLE>
diff --git a/gettext-tools/doc/gettext_13.html b/gettext-tools/doc/gettext_13.html
index c0a29b5..0afc8a7 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 13  The Maintainer's View</TITLE>
@@ -454,7 +454,7 @@ 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.7 distribution itself, or from the GNU
+<CODE>gettext</CODE> 0.19.8.1 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
@@ -645,7 +645,7 @@ This is done by a set of lines like these:
 
 <PRE>
 PACKAGE=gettext
-VERSION=0.19.7
+VERSION=0.19.8.1
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -656,13 +656,13 @@ or, if you are using GNU <CODE>automake</CODE>, by a line like this:
 
 
 <PRE>
-AM_INIT_AUTOMAKE(gettext, 0.19.7)
+AM_INIT_AUTOMAKE(gettext, 0.19.8.1)
 </PRE>
 
 Of course, you replace <SAMP>&lsquo;gettext&rsquo;</SAMP> with the name of your package,
-and <SAMP>&lsquo;0.19.7&rsquo;</SAMP> by its version numbers, exactly as they
+and <SAMP>&lsquo;0.19.8.1&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.7.tar.gz&rsquo;</TT>, here).
+(<TT>&lsquo;gettext-0.19.8.1.tar.gz&rsquo;</TT>, here).
 
 <LI>Check for internationalization support.
 
@@ -1751,7 +1751,7 @@ form
 </P>
 
 <PRE>
-AM_GNU_GETTEXT_VERSION(0.19.7)
+AM_GNU_GETTEXT_VERSION(0.19.8)
 </PRE>
 
 <P>
@@ -1861,9 +1861,9 @@ 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</VAR>)</CODE> instead.  For
-example, if gettext 0.19.7 is installed on your system
+example, if gettext 0.19.8 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.
+0.19.8 will be copied into a source package.
 
 </P>
 
@@ -1912,9 +1912,9 @@ Output version information and exit.
 
 <P>
 <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
+to the current one, 0.19.8.  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
+0.19.8, you need to install this same version of GNU
 <CODE>gettext</CODE> at least.
 
 </P>
diff --git a/gettext-tools/doc/gettext_14.html b/gettext-tools/doc/gettext_14.html
index c4632f0..275131f 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 14  The Installer's and Distributor's View</TITLE>
diff --git a/gettext-tools/doc/gettext_15.html b/gettext-tools/doc/gettext_15.html
index ccd7f2b..cbca1c8 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 15  Other Programming Languages</TITLE>
@@ -4479,7 +4479,7 @@ an ITS rule with an XML file.  If the above ITS file is saved as
 <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
+XML file<A NAME="DOCF7" HREF="gettext_foot.html#FOOT7">(7)</A>.  The <CODE>locatingRule</CODE> element can have child
 <CODE>documentRule</CODE> element, which adds checks on the content of the XML
 file.
 
diff --git a/gettext-tools/doc/gettext_16.html b/gettext-tools/doc/gettext_16.html
index 4ab4d7f..ba6e7ab 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 16  Concluding Remarks</TITLE>
diff --git a/gettext-tools/doc/gettext_17.html b/gettext-tools/doc/gettext_17.html
index 1399c1d..0083590 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - A  Language Codes</TITLE>
diff --git a/gettext-tools/doc/gettext_18.html b/gettext-tools/doc/gettext_18.html
index de0810d..708c76c 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - B  Country Codes</TITLE>
diff --git a/gettext-tools/doc/gettext_19.html b/gettext-tools/doc/gettext_19.html
index b4394d5..7da15ac 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - C  Licenses</TITLE>
diff --git a/gettext-tools/doc/gettext_2.html b/gettext-tools/doc/gettext_2.html
index 46e9a6b..005c7bf 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 2  The User's View</TITLE>
diff --git a/gettext-tools/doc/gettext_20.html b/gettext-tools/doc/gettext_20.html
index b6296d8..849bd4c 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Program Index</TITLE>
diff --git a/gettext-tools/doc/gettext_21.html b/gettext-tools/doc/gettext_21.html
index 016d343..559abc3 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Option Index</TITLE>
@@ -415,8 +415,8 @@ Jump to:
 <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_5.html#IDX188">-c, <CODE>xgettext</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>
@@ -428,28 +428,28 @@ Jump to:
 <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_10.html#IDX978">-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_9.html#IDX751">-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_5.html#IDX171">-d, <CODE>xgettext</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_9.html#IDX661">-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#IDX558">-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>
@@ -457,8 +457,8 @@ Jump to:
 <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_9.html#IDX663">-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>
@@ -501,16 +501,16 @@ Jump to:
 <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_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_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#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_5.html#IDX242">-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>
@@ -534,13 +534,13 @@ Jump to:
 <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#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#IDX886">-p, <CODE>msgattrib</CODE> option</A>
 <LI><A HREF="gettext_9.html#IDX571">-P, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX587">-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#IDX803">-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>
@@ -592,15 +592,15 @@ Jump to:
 <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_10.html#IDX1054">-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_10.html#IDX1099">-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>
diff --git a/gettext-tools/doc/gettext_22.html b/gettext-tools/doc/gettext_22.html
index be79d64..3e22e8b 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Variable Index</TITLE>
diff --git a/gettext-tools/doc/gettext_23.html b/gettext-tools/doc/gettext_23.html
index 9918482..ec2ca4a 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - PO Mode Index</TITLE>
diff --git a/gettext-tools/doc/gettext_24.html b/gettext-tools/doc/gettext_24.html
index d253509..16baf09 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Autoconf Macro Index</TITLE>
diff --git a/gettext-tools/doc/gettext_25.html b/gettext-tools/doc/gettext_25.html
index a337d39..3eb4454 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - General Index</TITLE>
diff --git a/gettext-tools/doc/gettext_3.html b/gettext-tools/doc/gettext_3.html
index ae348a8..bb51ebe 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 3  The Format of PO Files</TITLE>
diff --git a/gettext-tools/doc/gettext_4.html b/gettext-tools/doc/gettext_4.html
index 209d5bb..61d4410 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 4  Preparing Program Sources</TITLE>
diff --git a/gettext-tools/doc/gettext_5.html b/gettext-tools/doc/gettext_5.html
index 420a170..509ac1b 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 5  Making the PO Template File</TITLE>
@@ -252,6 +252,10 @@ Prohibit whitespace before an ellipsis character
 <DD>
 Prefer Unicode quotation marks over ASCII <CODE>"'`</CODE>
 
+<DT><SAMP>&lsquo;bullet-unicode&rsquo;</SAMP>
+<DD>
+Prefer Unicode bullet character over ASCII <CODE>*</CODE> or <CODE>-</CODE>
+
 </DL>
 
 The option has an effect on all input files.  To enable or disable
diff --git a/gettext-tools/doc/gettext_6.html b/gettext-tools/doc/gettext_6.html
index fb0beb4..621147a 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 6  Creating a New PO File</TITLE>
diff --git a/gettext-tools/doc/gettext_7.html b/gettext-tools/doc/gettext_7.html
index edb120f..2f62513 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 7  Updating Existing PO Files</TITLE>
diff --git a/gettext-tools/doc/gettext_8.html b/gettext-tools/doc/gettext_8.html
index 3320583..b2d2844 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 8  Editing PO Files</TITLE>
diff --git a/gettext-tools/doc/gettext_9.html b/gettext-tools/doc/gettext_9.html
index bff7d4f..8c8cc7f 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 9  Manipulating PO Files</TITLE>
diff --git a/gettext-tools/doc/gettext_foot.html b/gettext-tools/doc/gettext_foot.html
index 809fb96..d00aa31 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <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.7</H1>
+<H1>GNU gettext tools, version 0.19.8.1</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.19.7, 8 December 2015</H2>
+<H2>Edition 0.19.8.1, 25 March 2016</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -43,8 +43,15 @@ use it as a baseline (see section <A HREF="gettext_6.html#SEC38">6.1  Invoking t
 <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>
+<H3><A NAME="FOOT7" HREF="gettext_15.html#DOCF7">(7)</A></H3>
+<P>Note that the file name matching is done after
+removing any <CODE>.in</CODE> suffix from the input file name.  Thus the
+<CODE>pattern</CODE> attribute must not include a pattern matching <CODE>.in</CODE>.
+For example, if the input file name is <TT>&lsquo;foo.msg.in&rsquo;</TT>, the pattern
+should be either <CODE>*.msg</CODE> or just <CODE>*</CODE>, rather than
+<CODE>*.in</CODE>.
 <P><HR><P>
-This document was generated on 28 December 2015 using the
+This document was generated on 11 June 2016 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 346a6d1..f305a7f 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 28 December 2015 -->
+     from gettext.texi on 11 June 2016 -->
 
 <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.7</H1>
+<H1>GNU gettext tools, version 0.19.8.1</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.19.7, 8 December 2015</H2>
+<H2>Edition 0.19.8.1, 25 March 2016</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -467,7 +467,7 @@
 <LI><A NAME="TOC344" HREF="gettext_25.html#SEC344">General Index</A>
 </UL>
 <P><HR><P>
-This document was generated on 28 December 2015 using the
+This document was generated on 11 June 2016 using the
 <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
 translator version 1.52b.</P>
 </BODY>
diff --git a/gettext-tools/doc/msgfmt.texi b/gettext-tools/doc/msgfmt.texi
index a6fefcd..90350cb 100644
--- a/gettext-tools/doc/msgfmt.texi
+++ b/gettext-tools/doc/msgfmt.texi
@@ -382,14 +382,13 @@ Align strings to @var{number} bytes (default: 1).
 @item --endianness=@var{byteorder}
 @opindex --endianness@r{, @code{msgfmt} option}
 Write out 32-bit numbers in the given byte order.  The possible values are
-@code{big} and @code{little}.  The default depends on the platform, namely
-on the endianness of the CPU.
+@code{big} and @code{little}.  The default is @code{little}.
 
 MO files of any endianness can be used on any platform.  When a MO file has
 an endianness other than the platform's one, the 32-bit numbers from the MO
 file are swapped at runtime.  The performance impact is negligible.
 
-This option can be useful to produce MO files that are independent of the
+This option can be useful to produce MO files that are optimized for one
 platform.
 
 @item --no-hash
diff --git a/gettext-tools/doc/stamp-vti b/gettext-tools/doc/stamp-vti
index c151d9f..92f1dde 100644
--- a/gettext-tools/doc/stamp-vti
+++ b/gettext-tools/doc/stamp-vti
@@ -1,5 +1,5 @@
-@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
+@set UPDATED 25 March 2016
+@set UPDATED-MONTH March 2016
+@set EDITION 0.19.8.1
+@set VERSION 0.19.8.1
+@set ARCHIVE-VERSION 0.19.8
diff --git a/gettext-tools/doc/version.texi b/gettext-tools/doc/version.texi
index c151d9f..92f1dde 100644
--- a/gettext-tools/doc/version.texi
+++ b/gettext-tools/doc/version.texi
@@ -1,5 +1,5 @@
-@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
+@set UPDATED 25 March 2016
+@set UPDATED-MONTH March 2016
+@set EDITION 0.19.8.1
+@set VERSION 0.19.8.1
+@set ARCHIVE-VERSION 0.19.8
diff --git a/gettext-tools/doc/xgettext.texi b/gettext-tools/doc/xgettext.texi
index d6a5f01..e2700d9 100644
--- a/gettext-tools/doc/xgettext.texi
+++ b/gettext-tools/doc/xgettext.texi
@@ -160,6 +160,9 @@ Prohibit whitespace before an ellipsis character
 @item quote-unicode
 Prefer Unicode quotation marks over ASCII @code{"'`}
 
+@item bullet-unicode
+Prefer Unicode bullet character over ASCII @code{*} or @code{-}
+
 @end table
 
 The option has an effect on all input files.  To enable or disable
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 5aa6d30..e69de29 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,11 +0,0 @@
-No more ChangeLog files
-========================
-Do not modify any of the ChangeLog files in gettext.  Starting on
-October 14th, 2015 we put changelog information only in the git commit
-log, and generate a top-level ChangeLog file from logs at "make dist"
-time.
-
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index fe4ff72..a8bcd54 100644
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gettext-tools/examples subdirectory of GNU gettext
-## Copyright (C) 2001-2007, 2009-2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 2001-2007, 2009-2016 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
diff --git a/gettext-tools/examples/configure b/gettext-tools/examples/configure
index f3ad26a..3c53398 100755
--- a/gettext-tools/examples/configure
+++ b/gettext-tools/examples/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gettext-examples 0.19.7.
+# Generated by GNU Autoconf 2.69 for gettext-examples 0.19.8.1.
 #
 # Report bugs to <bug-gnu-gettext@gnu.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gettext-examples'
 PACKAGE_TARNAME='gettext-examples'
-PACKAGE_VERSION='0.19.7'
-PACKAGE_STRING='gettext-examples 0.19.7'
+PACKAGE_VERSION='0.19.8.1'
+PACKAGE_STRING='gettext-examples 0.19.8.1'
 PACKAGE_BUGREPORT='bug-gnu-gettext@gnu.org'
 PACKAGE_URL=''
 
@@ -1225,7 +1225,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gettext-examples 0.19.7 to adapt to many kinds of systems.
+\`configure' configures gettext-examples 0.19.8.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1293,7 +1293,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gettext-examples 0.19.7:";;
+     short | recursive ) echo "Configuration of gettext-examples 0.19.8.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1368,7 +1368,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gettext-examples configure 0.19.7
+gettext-examples configure 0.19.8.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1385,7 +1385,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gettext-examples $as_me 0.19.7, which was
+It was created by gettext-examples $as_me 0.19.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2249,7 +2249,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gettext-examples'
- VERSION='0.19.7'
+ VERSION='0.19.8.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3273,7 +3273,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gettext-examples $as_me 0.19.7, which was
+This file was extended by gettext-examples $as_me 0.19.8.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3330,7 +3330,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gettext-examples config.status 0.19.7
+gettext-examples config.status 0.19.8.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac
index 3ad3be0..c395c3d 100644
--- a/gettext-tools/examples/configure.ac
+++ b/gettext-tools/examples/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-tools/examples directory of GNU gettext
-dnl Copyright (C) 2006, 2009, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009, 2015-2016 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
diff --git a/gettext-tools/examples/hello-c++-gnome/po/eo.po b/gettext-tools/examples/hello-c++-gnome/po/eo.po
index 7a0b93f..03a678d 100644
--- a/gettext-tools/examples/hello-c++-gnome/po/eo.po
+++ b/gettext-tools/examples/hello-c++-gnome/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.15-pre5\n"
+"Project-Id-Version: hello-c++-gnome 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c++-gnome/po/hr.po b/gettext-tools/examples/hello-c++-gnome/po/hr.po
index 8a4dbfb..b230c20 100644
--- a/gettext-tools/examples/hello-c++-gnome/po/hr.po
+++ b/gettext-tools/examples/hello-c++-gnome/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.18\n"
+"Project-Id-Version: hello-c++-gnome 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.cc:50
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-c++-gnome/po/sv.po b/gettext-tools/examples/hello-c++-gnome/po/sv.po
index d1a3d13..fe9b373 100644
--- a/gettext-tools/examples/hello-c++-gnome/po/sv.po
+++ b/gettext-tools/examples/hello-c++-gnome/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-c++-gnome.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-gnome 0.19.4-rc1\n"
+"Project-Id-Version: hello-c++-gnome 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c++-kde/admin/acinclude.m4.in b/gettext-tools/examples/hello-c++-kde/admin/acinclude.m4.in
index 8fb02ea..a3cf18c 100644
--- a/gettext-tools/examples/hello-c++-kde/admin/acinclude.m4.in
+++ b/gettext-tools/examples/hello-c++-kde/admin/acinclude.m4.in
@@ -3084,7 +3084,7 @@ dnl This is a merge of some macros out of the gettext aclocal.m4
 dnl since we don't need anything, I took the things we need
 dnl the copyright for them is:
 dnl >
-dnl Copyright (C) 1994-1998, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1994-1998, 2015-2016 Free Software Foundation, Inc.
 dnl This Makefile.in is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/examples/hello-c++-kde/admin/compile b/gettext-tools/examples/hello-c++-kde/admin/compile
index 5c54efb..0970d88 100755
--- a/gettext-tools/examples/hello-c++-kde/admin/compile
+++ b/gettext-tools/examples/hello-c++-kde/admin/compile
@@ -2,7 +2,7 @@
 
 # Wrapper for compilers which do not understand `-c -o'.
 
-# Copyright 1999-2000, 2015 Free Software Foundation, Inc.
+# Copyright 1999-2000, 2015-2016 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/examples/hello-c++-kde/admin/config.guess b/gettext-tools/examples/hello-c++-kde/admin/config.guess
index a2051be..58dc0e2 100755
--- a/gettext-tools/examples/hello-c++-kde/admin/config.guess
+++ b/gettext-tools/examples/hello-c++-kde/admin/config.guess
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992-2002, 2015 Free Software Foundation, Inc.
+#   Copyright (C) 1992-2002, 2015-2016 Free Software Foundation, Inc.
 
 timestamp='2002-10-21'
 
diff --git a/gettext-tools/examples/hello-c++-kde/admin/config.sub b/gettext-tools/examples/hello-c++-kde/admin/config.sub
index 154f906..2684853 100755
--- a/gettext-tools/examples/hello-c++-kde/admin/config.sub
+++ b/gettext-tools/examples/hello-c++-kde/admin/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992-2002, 2015 Free Software Foundation, Inc.
+#   Copyright (C) 1992-2002, 2015-2016 Free Software Foundation, Inc.
 
 timestamp='2002-09-05'
 
diff --git a/gettext-tools/examples/hello-c++-kde/admin/depcomp b/gettext-tools/examples/hello-c++-kde/admin/depcomp
index f4f27c6..564336e 100755
--- a/gettext-tools/examples/hello-c++-kde/admin/depcomp
+++ b/gettext-tools/examples/hello-c++-kde/admin/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999-2000, 2015 Free Software Foundation, Inc.
+# Copyright 1999-2000, 2015-2016 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
diff --git a/gettext-tools/examples/hello-c++-kde/admin/libtool.m4.in b/gettext-tools/examples/hello-c++-kde/admin/libtool.m4.in
index 8c0399d..50bd616 100644
--- a/gettext-tools/examples/hello-c++-kde/admin/libtool.m4.in
+++ b/gettext-tools/examples/hello-c++-kde/admin/libtool.m4.in
@@ -1,5 +1,5 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996-2001, 2015 Free Software Foundation, Inc.
+## Copyright 1996-2001, 2015-2016 Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
 ## This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/examples/hello-c++-kde/admin/ltmain.sh b/gettext-tools/examples/hello-c++-kde/admin/ltmain.sh
index df9dca2..42360ed 100644
--- a/gettext-tools/examples/hello-c++-kde/admin/ltmain.sh
+++ b/gettext-tools/examples/hello-c++-kde/admin/ltmain.sh
@@ -1,7 +1,7 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996-2001, 2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001, 2015-2016 Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/examples/hello-c++-kde/admin/missing b/gettext-tools/examples/hello-c++-kde/admin/missing
index 62cad08..e95a80a 100755
--- a/gettext-tools/examples/hello-c++-kde/admin/missing
+++ b/gettext-tools/examples/hello-c++-kde/admin/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996-1997, 1999-2000, 2002, 2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-1997, 1999-2000, 2002, 2015-2016 Free Software Foundation,
+# Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/examples/hello-c++-kde/admin/ylwrap b/gettext-tools/examples/hello-c++-kde/admin/ylwrap
index 5403335..f9123ee 100755
--- a/gettext-tools/examples/hello-c++-kde/admin/ylwrap
+++ b/gettext-tools/examples/hello-c++-kde/admin/ylwrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
-# Copyright 1996-1999, 2015 Free Software Foundation, Inc.
+# Copyright 1996-1999, 2015-2016 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/examples/hello-c++-kde/hello.cc b/gettext-tools/examples/hello-c++-kde/hello.cc
index e8cdf74..17d92c0 100644
--- a/gettext-tools/examples/hello-c++-kde/hello.cc
+++ b/gettext-tools/examples/hello-c++-kde/hello.cc
@@ -1,5 +1,5 @@
 // Example for use of GNU gettext.
-// Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
 // This file is published under the GNU General Public License.
 
 // Source code of the C++ program.
diff --git a/gettext-tools/examples/hello-c++-kde/hellowindow.cc b/gettext-tools/examples/hello-c++-kde/hellowindow.cc
index b32b080..60c3eb3 100644
--- a/gettext-tools/examples/hello-c++-kde/hellowindow.cc
+++ b/gettext-tools/examples/hello-c++-kde/hellowindow.cc
@@ -1,5 +1,5 @@
 // Example for use of GNU gettext.
-// Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
 // This file is published under the GNU General Public License.
 
 #if HAVE_CONFIG_H
diff --git a/gettext-tools/examples/hello-c++-kde/hellowindow.h b/gettext-tools/examples/hello-c++-kde/hellowindow.h
index c6e2774..4c2c78e 100644
--- a/gettext-tools/examples/hello-c++-kde/hellowindow.h
+++ b/gettext-tools/examples/hello-c++-kde/hellowindow.h
@@ -1,5 +1,5 @@
 // Example for use of GNU gettext.
-// Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
 // This file is published under the GNU General Public License.
 
 /* Declare KMainWindow.  */
diff --git a/gettext-tools/examples/hello-c++-kde/po/eo.po b/gettext-tools/examples/hello-c++-kde/po/eo.po
index ec09dd7..a415a65 100644
--- a/gettext-tools/examples/hello-c++-kde/po/eo.po
+++ b/gettext-tools/examples/hello-c++-kde/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.15-pre5\n"
+"Project-Id-Version: hello-c++-kde 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +18,7 @@ msgstr ""
 
 #: hello.cc:46
 msgid "Hello example"
-msgstr "Saluto-ekzemplo"
+msgstr "Saluton-ekzemplo"
 
 #: hello.cc:48
 msgid "Hello world example"
diff --git a/gettext-tools/examples/hello-c++-kde/po/hr.po b/gettext-tools/examples/hello-c++-kde/po/hr.po
index bd4b31c..ebc79e2 100644
--- a/gettext-tools/examples/hello-c++-kde/po/hr.po
+++ b/gettext-tools/examples/hello-c++-kde/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.18\n"
+"Project-Id-Version: hello-c++-kde 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.cc:46
 msgid "Hello example"
diff --git a/gettext-tools/examples/hello-c++-kde/po/sv.po b/gettext-tools/examples/hello-c++-kde/po/sv.po
index fee7248..335febb 100644
--- a/gettext-tools/examples/hello-c++-kde/po/sv.po
+++ b/gettext-tools/examples/hello-c++-kde/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-c++-kde.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-kde 0.19.4-rc1\n"
+"Project-Id-Version: hello-c++-kde 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +24,7 @@ msgstr "Hälsningsexempel"
 
 #: hello.cc:48
 msgid "Hello world example"
-msgstr "\"Hej världen\"-exempel"
+msgstr "Hej världen-exempel"
 
 #: hellowindow.cc:42
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-c++-qt/po/eo.po b/gettext-tools/examples/hello-c++-qt/po/eo.po
index 85b510b..d83a16f 100644
--- a/gettext-tools/examples/hello-c++-qt/po/eo.po
+++ b/gettext-tools/examples/hello-c++-qt/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.15-pre5\n"
+"Project-Id-Version: hello-c++-qt 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c++-qt/po/hr.po b/gettext-tools/examples/hello-c++-qt/po/hr.po
index c8fce2e..e7ac1bd 100644
--- a/gettext-tools/examples/hello-c++-qt/po/hr.po
+++ b/gettext-tools/examples/hello-c++-qt/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.18\n"
+"Project-Id-Version: hello-c++-qt 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.cc:45
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-c++-qt/po/sv.po b/gettext-tools/examples/hello-c++-qt/po/sv.po
index c93ca51..8688278 100644
--- a/gettext-tools/examples/hello-c++-qt/po/sv.po
+++ b/gettext-tools/examples/hello-c++-qt/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-c++-qt.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-qt 0.19.4-rc1\n"
+"Project-Id-Version: hello-c++-qt 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/eo.po b/gettext-tools/examples/hello-c++-wxwidgets/po/eo.po
index 5d1d738..0a3e382 100644
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/eo.po
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.15-pre5\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/hr.po b/gettext-tools/examples/hello-c++-wxwidgets/po/hr.po
index e8c9d19..d90875e 100644
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/hr.po
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.18\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.cc:68
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/sv.po b/gettext-tools/examples/hello-c++-wxwidgets/po/sv.po
index f4604c1..8f51b8a 100644
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/sv.po
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-c++-wxwidgets.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++-wxwidgets 0.19.4-rc1\n"
+"Project-Id-Version: hello-c++-wxwidgets 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c++/po/eo.po b/gettext-tools/examples/hello-c++/po/eo.po
index 8d89ef5..5721880 100644
--- a/gettext-tools/examples/hello-c++/po/eo.po
+++ b/gettext-tools/examples/hello-c++/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.15-pre5\n"
+"Project-Id-Version: hello-c++ 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c++/po/hr.po b/gettext-tools/examples/hello-c++/po/hr.po
index d56ffac..dbf4794 100644
--- a/gettext-tools/examples/hello-c++/po/hr.po
+++ b/gettext-tools/examples/hello-c++/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.18\n"
+"Project-Id-Version: hello-c++ 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.cc:39
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-c++/po/sv.po b/gettext-tools/examples/hello-c++/po/sv.po
index af0274d..01870fc 100644
--- a/gettext-tools/examples/hello-c++/po/sv.po
+++ b/gettext-tools/examples/hello-c++/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-c++.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c++ 0.19.4-rc1\n"
+"Project-Id-Version: hello-c++ 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c-gnome/po/eo.po b/gettext-tools/examples/hello-c-gnome/po/eo.po
index fee62b1..f4edf36 100644
--- a/gettext-tools/examples/hello-c-gnome/po/eo.po
+++ b/gettext-tools/examples/hello-c-gnome/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.15-pre5\n"
+"Project-Id-Version: hello-c-gnome 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c-gnome/po/hr.po b/gettext-tools/examples/hello-c-gnome/po/hr.po
index 5487326..2fa0681 100644
--- a/gettext-tools/examples/hello-c-gnome/po/hr.po
+++ b/gettext-tools/examples/hello-c-gnome/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.18\n"
+"Project-Id-Version: hello-c-gnome 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.c:46
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-c-gnome/po/sv.po b/gettext-tools/examples/hello-c-gnome/po/sv.po
index 22fa6d1..eef654a 100644
--- a/gettext-tools/examples/hello-c-gnome/po/sv.po
+++ b/gettext-tools/examples/hello-c-gnome/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-c-gnome.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome 0.19.4-rc1\n"
+"Project-Id-Version: hello-c-gnome 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c-gnome3/po/eo.po b/gettext-tools/examples/hello-c-gnome3/po/eo.po
index deec936..6fa119a 100644
--- a/gettext-tools/examples/hello-c-gnome3/po/eo.po
+++ b/gettext-tools/examples/hello-c-gnome3/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.15-pre5\n"
+"Project-Id-Version: hello-c-gnome3 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
@@ -16,23 +17,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: hello.c:79
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<big>Hello world!</big>\n"
 "This program is running as process number <b>%d</b>."
-msgstr "Ĉi tiu programo rulas kiel procezo kun numero %d."
+msgstr ""
+"<big>Saluton mondo!</big>\n"
+"Ĉi tiu programo rulas kiel procezo kun numero <b>%d</b>."
 
 #: hello.c:84
 msgid "<big><u>This is another text</u></big>"
-msgstr ""
+msgstr "<big><u>Tio ĉi estas alia teksto</u></big>"
 
 #: hello.c:86
 msgid "<big><i>This is yet another text</i></big>"
-msgstr ""
+msgstr "<big><i>Tio ĉi estas pli alia teksto</i></big>"
 
 #: hello.desktop.in.in:4
 msgid "Hello"
-msgstr ""
+msgstr "Saluton"
 
 #: hello.desktop.in.in:5
 msgid "Hello, world!"
@@ -40,16 +43,16 @@ msgstr "Saluton, mondo!"
 
 #: hello.ui:5
 msgid "Example Application"
-msgstr ""
+msgstr "Ekzempla aplikaĵo"
 
 #: hello.ui:33
 msgid "Update text"
-msgstr ""
+msgstr "Äœisdatigi tekston"
 
 #: hello.gschema.xml:7
 msgid "Use XML markup"
-msgstr ""
+msgstr "Uzi marklingvon XML"
 
 #: hello.gschema.xml:8
 msgid "Whether to use XML markup in the text."
-msgstr ""
+msgstr "Ĉu uzi marklingvon XML en la teksto."
diff --git a/gettext-tools/examples/hello-c-gnome3/po/hr.po b/gettext-tools/examples/hello-c-gnome3/po/hr.po
index 8e2a8cb..726dec3 100644
--- a/gettext-tools/examples/hello-c-gnome3/po/hr.po
+++ b/gettext-tools/examples/hello-c-gnome3/po/hr.po
@@ -5,36 +5,39 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.18\n"
+"Project-Id-Version: hello-c-gnome3 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.c:79
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<big>Hello world!</big>\n"
 "This program is running as process number <b>%d</b>."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
+msgstr ""
+"<big>Pozdrav, svijete!</big>\n"
+"Ovaj program je pokrenut kao proces broj <b>%d</b>."
 
 #: hello.c:84
 msgid "<big><u>This is another text</u></big>"
-msgstr ""
+msgstr "<big><u>Ovo je jedan drugi tekst</u></big>"
 
 #: hello.c:86
 msgid "<big><i>This is yet another text</i></big>"
-msgstr ""
+msgstr "<big><i>A ovo je još jedan drugi tekst</i></big>"
 
 #: hello.desktop.in.in:4
 msgid "Hello"
-msgstr ""
+msgstr "Pozdrav"
 
 #: hello.desktop.in.in:5
 msgid "Hello, world!"
@@ -42,16 +45,16 @@ msgstr "Pozdrav, svijete!"
 
 #: hello.ui:5
 msgid "Example Application"
-msgstr ""
+msgstr "Primjer uporabe"
 
 #: hello.ui:33
 msgid "Update text"
-msgstr ""
+msgstr "Ažuriranje teksta"
 
 #: hello.gschema.xml:7
 msgid "Use XML markup"
-msgstr ""
+msgstr "Uporaba XML oznaka"
 
 #: hello.gschema.xml:8
 msgid "Whether to use XML markup in the text."
-msgstr ""
+msgstr "Da li upotrijebiti XML oznake u tekstu."
diff --git a/gettext-tools/examples/hello-c-gnome3/po/sv.po b/gettext-tools/examples/hello-c-gnome3/po/sv.po
index 1bb9f65..feda4d0 100644
--- a/gettext-tools/examples/hello-c-gnome3/po/sv.po
+++ b/gettext-tools/examples/hello-c-gnome3/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-c-gnome3.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c-gnome3 0.19.4-rc1\n"
+"Project-Id-Version: hello-c-gnome3 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -15,19 +19,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: hello.c:79
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<big>Hello world!</big>\n"
 "This program is running as process number <b>%d</b>."
-msgstr "Detta program kör som process nummer %d."
+msgstr ""
+"<big>Hej världen!</big>\n"
+"Detta program kör som process nummer <b>%d</b>."
 
 #: hello.c:84
 msgid "<big><u>This is another text</u></big>"
-msgstr ""
+msgstr "<big><u>Detta är en annan text</u></big>"
 
 #: hello.c:86
 msgid "<big><i>This is yet another text</i></big>"
-msgstr ""
+msgstr "<big><i>Detta är ytterligare en annan text</i></big>"
 
 #: hello.desktop.in.in:4
 msgid "Hello"
@@ -43,12 +49,12 @@ msgstr "Exempelprogram"
 
 #: hello.ui:33
 msgid "Update text"
-msgstr ""
+msgstr "Uppdatera text"
 
 #: hello.gschema.xml:7
 msgid "Use XML markup"
-msgstr ""
+msgstr "Använd XML-märkning"
 
 #: hello.gschema.xml:8
 msgid "Whether to use XML markup in the text."
-msgstr ""
+msgstr "Huruvida XML-märkning skall användas i texten."
diff --git a/gettext-tools/examples/hello-c/po/eo.po b/gettext-tools/examples/hello-c/po/eo.po
index c5c9d8e..96eeca4 100644
--- a/gettext-tools/examples/hello-c/po/eo.po
+++ b/gettext-tools/examples/hello-c/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.15-pre5\n"
+"Project-Id-Version: hello-c 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-c/po/hr.po b/gettext-tools/examples/hello-c/po/hr.po
index 07a7c85..cc35d49 100644
--- a/gettext-tools/examples/hello-c/po/hr.po
+++ b/gettext-tools/examples/hello-c/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.18\n"
+"Project-Id-Version: hello-c 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.c:30
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-c/po/sv.po b/gettext-tools/examples/hello-c/po/sv.po
index 1c58c73..5d8121c 100644
--- a/gettext-tools/examples/hello-c/po/sv.po
+++ b/gettext-tools/examples/hello-c/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-c.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-c 0.19.4-rc1\n"
+"Project-Id-Version: hello-c 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-clisp/po/eo.po b/gettext-tools/examples/hello-clisp/po/eo.po
index 875b992..bd15ee1 100644
--- a/gettext-tools/examples/hello-clisp/po/eo.po
+++ b/gettext-tools/examples/hello-clisp/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.15-pre5\n"
+"Project-Id-Version: hello-clisp 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-clisp/po/hr.po b/gettext-tools/examples/hello-clisp/po/hr.po
index e19fbd0..39507b2 100644
--- a/gettext-tools/examples/hello-clisp/po/hr.po
+++ b/gettext-tools/examples/hello-clisp/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.18\n"
+"Project-Id-Version: hello-clisp 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.lisp.in:11
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-clisp/po/sv.po b/gettext-tools/examples/hello-clisp/po/sv.po
index 110b9df..0a12fb9 100644
--- a/gettext-tools/examples/hello-clisp/po/sv.po
+++ b/gettext-tools/examples/hello-clisp/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-clisp.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-clisp 0.19.4-rc1\n"
+"Project-Id-Version: hello-clisp 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-csharp-forms/README b/gettext-tools/examples/hello-csharp-forms/README
index f2d8b67..f6ed5cc 100644
--- a/gettext-tools/examples/hello-csharp-forms/README
+++ b/gettext-tools/examples/hello-csharp-forms/README
@@ -78,4 +78,4 @@ Instead one uses intermediate containers for the purpose of alignment.)
 
 Acknowledgement: This preface borrows ideas from an article of Luke Plant.
 
-Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
diff --git a/gettext-tools/examples/hello-csharp-forms/po/eo.po b/gettext-tools/examples/hello-csharp-forms/po/eo.po
index 82ca096..b3374d3 100644
--- a/gettext-tools/examples/hello-csharp-forms/po/eo.po
+++ b/gettext-tools/examples/hello-csharp-forms/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.15-pre5\n"
+"Project-Id-Version: hello-csharp-forms 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-csharp-forms/po/hr.po b/gettext-tools/examples/hello-csharp-forms/po/hr.po
index 175cc73..e159a1a 100644
--- a/gettext-tools/examples/hello-csharp-forms/po/hr.po
+++ b/gettext-tools/examples/hello-csharp-forms/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.18\n"
+"Project-Id-Version: hello-csharp-forms 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.cs:29
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-csharp-forms/po/sv.po b/gettext-tools/examples/hello-csharp-forms/po/sv.po
index 7fe04ae..2a877fd 100644
--- a/gettext-tools/examples/hello-csharp-forms/po/sv.po
+++ b/gettext-tools/examples/hello-csharp-forms/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-csharp-forms.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp-forms 0.19.4-rc1\n"
+"Project-Id-Version: hello-csharp-forms 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-csharp/po/eo.po b/gettext-tools/examples/hello-csharp/po/eo.po
index 1a2ff7e..5d68545 100644
--- a/gettext-tools/examples/hello-csharp/po/eo.po
+++ b/gettext-tools/examples/hello-csharp/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.15-pre5\n"
+"Project-Id-Version: hello-csharp 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-csharp/po/hr.po b/gettext-tools/examples/hello-csharp/po/hr.po
index 9789ad2..bc5a085 100644
--- a/gettext-tools/examples/hello-csharp/po/hr.po
+++ b/gettext-tools/examples/hello-csharp/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.18\n"
+"Project-Id-Version: hello-csharp 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.cs:14
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-csharp/po/sv.po b/gettext-tools/examples/hello-csharp/po/sv.po
index bdbb8d6..e062453 100644
--- a/gettext-tools/examples/hello-csharp/po/sv.po
+++ b/gettext-tools/examples/hello-csharp/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-csharp.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-csharp 0.19.4-rc1\n"
+"Project-Id-Version: hello-csharp 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-gawk/po/eo.po b/gettext-tools/examples/hello-gawk/po/eo.po
index 9dc6ee4..4e55112 100644
--- a/gettext-tools/examples/hello-gawk/po/eo.po
+++ b/gettext-tools/examples/hello-gawk/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.15-pre5\n"
+"Project-Id-Version: hello-gawk 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-gawk/po/hr.po b/gettext-tools/examples/hello-gawk/po/hr.po
index bb727fd..c2ee8c6 100644
--- a/gettext-tools/examples/hello-gawk/po/hr.po
+++ b/gettext-tools/examples/hello-gawk/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.18\n"
+"Project-Id-Version: hello-gawk 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.awk:11
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-gawk/po/sv.po b/gettext-tools/examples/hello-gawk/po/sv.po
index ec1c555..b74dbba 100644
--- a/gettext-tools/examples/hello-gawk/po/sv.po
+++ b/gettext-tools/examples/hello-gawk/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-gawk.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-gawk 0.19.4-rc1\n"
+"Project-Id-Version: hello-gawk 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-guile/po/eo.po b/gettext-tools/examples/hello-guile/po/eo.po
index fb9aa8f..9b20c9c 100644
--- a/gettext-tools/examples/hello-guile/po/eo.po
+++ b/gettext-tools/examples/hello-guile/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.15-pre5\n"
+"Project-Id-Version: hello-guile 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-guile/po/hr.po b/gettext-tools/examples/hello-guile/po/hr.po
index c28352b..05978f7 100644
--- a/gettext-tools/examples/hello-guile/po/hr.po
+++ b/gettext-tools/examples/hello-guile/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.18\n"
+"Project-Id-Version: hello-guile 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.scm:15
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-guile/po/sv.po b/gettext-tools/examples/hello-guile/po/sv.po
index 143f1c9..331c8c3 100644
--- a/gettext-tools/examples/hello-guile/po/sv.po
+++ b/gettext-tools/examples/hello-guile/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-guile.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-guile 0.19.4-rc1\n"
+"Project-Id-Version: hello-guile 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-java-awt/po/eo.po b/gettext-tools/examples/hello-java-awt/po/eo.po
index f924fb2..e811aa4 100644
--- a/gettext-tools/examples/hello-java-awt/po/eo.po
+++ b/gettext-tools/examples/hello-java-awt/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.15-pre5\n"
+"Project-Id-Version: hello-java-awt 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-java-awt/po/hr.po b/gettext-tools/examples/hello-java-awt/po/hr.po
index fa81fcb..bda4fa9 100644
--- a/gettext-tools/examples/hello-java-awt/po/hr.po
+++ b/gettext-tools/examples/hello-java-awt/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.18\n"
+"Project-Id-Version: hello-java-awt 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: Hello.java:23
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-java-awt/po/sv.po b/gettext-tools/examples/hello-java-awt/po/sv.po
index cab9a24..7d26c4a 100644
--- a/gettext-tools/examples/hello-java-awt/po/sv.po
+++ b/gettext-tools/examples/hello-java-awt/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-java-awt.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-awt 0.19.4-rc1\n"
+"Project-Id-Version: hello-java-awt 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-java-qtjambi/po/eo.po b/gettext-tools/examples/hello-java-qtjambi/po/eo.po
index fde8484..60b4928 100644
--- a/gettext-tools/examples/hello-java-qtjambi/po/eo.po
+++ b/gettext-tools/examples/hello-java-qtjambi/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.15-pre5\n"
+"Project-Id-Version: hello-java-qtjambi 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-java-qtjambi/po/hr.po b/gettext-tools/examples/hello-java-qtjambi/po/hr.po
index c1a551d..0909f5d 100644
--- a/gettext-tools/examples/hello-java-qtjambi/po/hr.po
+++ b/gettext-tools/examples/hello-java-qtjambi/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.18\n"
+"Project-Id-Version: hello-java-qtjambi 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: Hello.java:27
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-java-qtjambi/po/sv.po b/gettext-tools/examples/hello-java-qtjambi/po/sv.po
index 7229e22..3001b9c 100644
--- a/gettext-tools/examples/hello-java-qtjambi/po/sv.po
+++ b/gettext-tools/examples/hello-java-qtjambi/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-java-qtjambi.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-qtjambi 0.19.4-rc1\n"
+"Project-Id-Version: hello-java-qtjambi 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-java-swing/po/eo.po b/gettext-tools/examples/hello-java-swing/po/eo.po
index 0acfea8..9dbf1c2 100644
--- a/gettext-tools/examples/hello-java-swing/po/eo.po
+++ b/gettext-tools/examples/hello-java-swing/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.15-pre5\n"
+"Project-Id-Version: hello-java-swing 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-java-swing/po/hr.po b/gettext-tools/examples/hello-java-swing/po/hr.po
index 9267abb..85e5cd3 100644
--- a/gettext-tools/examples/hello-java-swing/po/hr.po
+++ b/gettext-tools/examples/hello-java-swing/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.18\n"
+"Project-Id-Version: hello-java-swing 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: Hello.java:20
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-java-swing/po/sv.po b/gettext-tools/examples/hello-java-swing/po/sv.po
index aaba073..d99297a 100644
--- a/gettext-tools/examples/hello-java-swing/po/sv.po
+++ b/gettext-tools/examples/hello-java-swing/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-java-swing.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java-swing 0.19.4-rc1\n"
+"Project-Id-Version: hello-java-swing 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-java/po/eo.po b/gettext-tools/examples/hello-java/po/eo.po
index 61591ea..7b89212 100644
--- a/gettext-tools/examples/hello-java/po/eo.po
+++ b/gettext-tools/examples/hello-java/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.15-pre5\n"
+"Project-Id-Version: hello-java 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-java/po/hr.po b/gettext-tools/examples/hello-java/po/hr.po
index 18378ee..8d38328 100644
--- a/gettext-tools/examples/hello-java/po/hr.po
+++ b/gettext-tools/examples/hello-java/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.18\n"
+"Project-Id-Version: hello-java 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: Hello.java:14
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-java/po/sv.po b/gettext-tools/examples/hello-java/po/sv.po
index fce2bde..e7d4600 100644
--- a/gettext-tools/examples/hello-java/po/sv.po
+++ b/gettext-tools/examples/hello-java/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-java.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-java 0.19.4-rc1\n"
+"Project-Id-Version: hello-java 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-librep/po/eo.po b/gettext-tools/examples/hello-librep/po/eo.po
index 55d26a0..ea9c1be 100644
--- a/gettext-tools/examples/hello-librep/po/eo.po
+++ b/gettext-tools/examples/hello-librep/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.15-pre5\n"
+"Project-Id-Version: hello-librep 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-librep/po/hr.po b/gettext-tools/examples/hello-librep/po/hr.po
index bb192b8..7d56e7f 100644
--- a/gettext-tools/examples/hello-librep/po/hr.po
+++ b/gettext-tools/examples/hello-librep/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.18\n"
+"Project-Id-Version: hello-librep 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.jl.in:12
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-librep/po/sv.po b/gettext-tools/examples/hello-librep/po/sv.po
index 70c98e9..a3b7857 100644
--- a/gettext-tools/examples/hello-librep/po/sv.po
+++ b/gettext-tools/examples/hello-librep/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-librep.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-librep 0.19.4-rc1\n"
+"Project-Id-Version: hello-librep 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-objc-gnome/po/eo.po b/gettext-tools/examples/hello-objc-gnome/po/eo.po
index a4084b1..0b68c56 100644
--- a/gettext-tools/examples/hello-objc-gnome/po/eo.po
+++ b/gettext-tools/examples/hello-objc-gnome/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.15-pre5\n"
+"Project-Id-Version: hello-objc-gnome 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-objc-gnome/po/hr.po b/gettext-tools/examples/hello-objc-gnome/po/hr.po
index a7310ef..49d5c8c 100644
--- a/gettext-tools/examples/hello-objc-gnome/po/hr.po
+++ b/gettext-tools/examples/hello-objc-gnome/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.18\n"
+"Project-Id-Version: hello-objc-gnome 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.m:47
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-objc-gnome/po/sv.po b/gettext-tools/examples/hello-objc-gnome/po/sv.po
index 939a1fc..a6d8f5e 100644
--- a/gettext-tools/examples/hello-objc-gnome/po/sv.po
+++ b/gettext-tools/examples/hello-objc-gnome/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-objc-gnome.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnome 0.19.4-rc1\n"
+"Project-Id-Version: hello-objc-gnome 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-objc-gnustep/po/eo.po b/gettext-tools/examples/hello-objc-gnustep/po/eo.po
index cc49a26..7a005f4 100644
--- a/gettext-tools/examples/hello-objc-gnustep/po/eo.po
+++ b/gettext-tools/examples/hello-objc-gnustep/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.15-pre5\n"
+"Project-Id-Version: hello-objc-gnustep 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-objc-gnustep/po/hr.po b/gettext-tools/examples/hello-objc-gnustep/po/hr.po
index 5937853..fedd714 100644
--- a/gettext-tools/examples/hello-objc-gnustep/po/hr.po
+++ b/gettext-tools/examples/hello-objc-gnustep/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.18\n"
+"Project-Id-Version: hello-objc-gnustep 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: Hello.m:49
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-objc-gnustep/po/sv.po b/gettext-tools/examples/hello-objc-gnustep/po/sv.po
index 09085c8..dad458f 100644
--- a/gettext-tools/examples/hello-objc-gnustep/po/sv.po
+++ b/gettext-tools/examples/hello-objc-gnustep/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-objc-gnustep.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc-gnustep 0.19.4-rc1\n"
+"Project-Id-Version: hello-objc-gnustep 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-objc/po/eo.po b/gettext-tools/examples/hello-objc/po/eo.po
index 21956a7..2e08159 100644
--- a/gettext-tools/examples/hello-objc/po/eo.po
+++ b/gettext-tools/examples/hello-objc/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.15-pre5\n"
+"Project-Id-Version: hello-objc 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-objc/po/hr.po b/gettext-tools/examples/hello-objc/po/hr.po
index 50a1e50..cb5ca74 100644
--- a/gettext-tools/examples/hello-objc/po/hr.po
+++ b/gettext-tools/examples/hello-objc/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.18\n"
+"Project-Id-Version: hello-objc 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.m:30
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-objc/po/sv.po b/gettext-tools/examples/hello-objc/po/sv.po
index 0df8e56..f4a1d15 100644
--- a/gettext-tools/examples/hello-objc/po/sv.po
+++ b/gettext-tools/examples/hello-objc/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-objc.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-objc 0.19.4-rc1\n"
+"Project-Id-Version: hello-objc 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-pascal/po/eo.po b/gettext-tools/examples/hello-pascal/po/eo.po
index a350a9a..c874b77 100644
--- a/gettext-tools/examples/hello-pascal/po/eo.po
+++ b/gettext-tools/examples/hello-pascal/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.15-pre5\n"
+"Project-Id-Version: hello-pascal 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-pascal/po/hr.po b/gettext-tools/examples/hello-pascal/po/hr.po
index 6e9567b..cf2dcfa 100644
--- a/gettext-tools/examples/hello-pascal/po/hr.po
+++ b/gettext-tools/examples/hello-pascal/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.18\n"
+"Project-Id-Version: hello-pascal 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.hello_world
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-pascal/po/sv.po b/gettext-tools/examples/hello-pascal/po/sv.po
index f7cef2e..ce51b53 100644
--- a/gettext-tools/examples/hello-pascal/po/sv.po
+++ b/gettext-tools/examples/hello-pascal/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-pascal.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-pascal 0.19.4-rc1\n"
+"Project-Id-Version: hello-pascal 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-perl/po/eo.po b/gettext-tools/examples/hello-perl/po/eo.po
index a291661..1af6663 100644
--- a/gettext-tools/examples/hello-perl/po/eo.po
+++ b/gettext-tools/examples/hello-perl/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.15-pre5\n"
+"Project-Id-Version: hello-perl 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-perl/po/hr.po b/gettext-tools/examples/hello-perl/po/hr.po
index e020e87..9087a60 100644
--- a/gettext-tools/examples/hello-perl/po/hr.po
+++ b/gettext-tools/examples/hello-perl/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.18\n"
+"Project-Id-Version: hello-perl 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello-1.pl.in:17 hello-2.pl.in:12
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-perl/po/sv.po b/gettext-tools/examples/hello-perl/po/sv.po
index 07904dd..900ceff 100644
--- a/gettext-tools/examples/hello-perl/po/sv.po
+++ b/gettext-tools/examples/hello-perl/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-perl.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-perl 0.19.4-rc1\n"
+"Project-Id-Version: hello-perl 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-php/po/eo.po b/gettext-tools/examples/hello-php/po/eo.po
index 309fba5..b273937 100644
--- a/gettext-tools/examples/hello-php/po/eo.po
+++ b/gettext-tools/examples/hello-php/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.15-pre5\n"
+"Project-Id-Version: hello-php 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-php/po/hr.po b/gettext-tools/examples/hello-php/po/hr.po
index 20f50ef..bb3f3c4 100644
--- a/gettext-tools/examples/hello-php/po/hr.po
+++ b/gettext-tools/examples/hello-php/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.18\n"
+"Project-Id-Version: hello-php 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.php:12
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-php/po/sv.po b/gettext-tools/examples/hello-php/po/sv.po
index ff5936d..94c8662 100644
--- a/gettext-tools/examples/hello-php/po/sv.po
+++ b/gettext-tools/examples/hello-php/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-php.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-php 0.19.4-rc1\n"
+"Project-Id-Version: hello-php 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-python/po/eo.po b/gettext-tools/examples/hello-python/po/eo.po
index 2f413a0..6782337 100644
--- a/gettext-tools/examples/hello-python/po/eo.po
+++ b/gettext-tools/examples/hello-python/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.15-pre5\n"
+"Project-Id-Version: hello-python 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-python/po/hr.po b/gettext-tools/examples/hello-python/po/hr.po
index ccdf625..ea0c4e2 100644
--- a/gettext-tools/examples/hello-python/po/hr.po
+++ b/gettext-tools/examples/hello-python/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.18\n"
+"Project-Id-Version: hello-python 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.py.in:12
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-python/po/sv.po b/gettext-tools/examples/hello-python/po/sv.po
index 61fdaf2..990d27f 100644
--- a/gettext-tools/examples/hello-python/po/sv.po
+++ b/gettext-tools/examples/hello-python/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-python.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-python 0.19.4-rc1\n"
+"Project-Id-Version: hello-python 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-sh/po/eo.po b/gettext-tools/examples/hello-sh/po/eo.po
index 091181e..97c14fb 100644
--- a/gettext-tools/examples/hello-sh/po/eo.po
+++ b/gettext-tools/examples/hello-sh/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.15-pre5\n"
+"Project-Id-Version: hello-sh 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-sh/po/hr.po b/gettext-tools/examples/hello-sh/po/hr.po
index 805bc90..85a6e58 100644
--- a/gettext-tools/examples/hello-sh/po/hr.po
+++ b/gettext-tools/examples/hello-sh/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.18\n"
+"Project-Id-Version: hello-sh 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.sh:14
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-sh/po/sv.po b/gettext-tools/examples/hello-sh/po/sv.po
index 6143a94..0f91dcd 100644
--- a/gettext-tools/examples/hello-sh/po/sv.po
+++ b/gettext-tools/examples/hello-sh/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-sh.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-sh 0.19.4-rc1\n"
+"Project-Id-Version: hello-sh 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-smalltalk/po/eo.po b/gettext-tools/examples/hello-smalltalk/po/eo.po
index 6182044..f5974a5 100644
--- a/gettext-tools/examples/hello-smalltalk/po/eo.po
+++ b/gettext-tools/examples/hello-smalltalk/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.15-pre5\n"
+"Project-Id-Version: hello-smalltalk 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-smalltalk/po/hr.po b/gettext-tools/examples/hello-smalltalk/po/hr.po
index 543c346..fa5d065 100644
--- a/gettext-tools/examples/hello-smalltalk/po/hr.po
+++ b/gettext-tools/examples/hello-smalltalk/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.18\n"
+"Project-Id-Version: hello-smalltalk 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.st.in:31
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-smalltalk/po/sv.po b/gettext-tools/examples/hello-smalltalk/po/sv.po
index 92b85d0..7c526e8 100644
--- a/gettext-tools/examples/hello-smalltalk/po/sv.po
+++ b/gettext-tools/examples/hello-smalltalk/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-smalltalk.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-smalltalk 0.19.4-rc1\n"
+"Project-Id-Version: hello-smalltalk 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-tcl-tk/po/eo.po b/gettext-tools/examples/hello-tcl-tk/po/eo.po
index 1872f7e..f30d91f 100644
--- a/gettext-tools/examples/hello-tcl-tk/po/eo.po
+++ b/gettext-tools/examples/hello-tcl-tk/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.15-pre5\n"
+"Project-Id-Version: hello-tcl-tk 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-tcl-tk/po/hr.po b/gettext-tools/examples/hello-tcl-tk/po/hr.po
index 7ab533d..91827b2 100644
--- a/gettext-tools/examples/hello-tcl-tk/po/hr.po
+++ b/gettext-tools/examples/hello-tcl-tk/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.18\n"
+"Project-Id-Version: hello-tcl-tk 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.tcl:13
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-tcl-tk/po/sv.po b/gettext-tools/examples/hello-tcl-tk/po/sv.po
index 95afec9..db20668 100644
--- a/gettext-tools/examples/hello-tcl-tk/po/sv.po
+++ b/gettext-tools/examples/hello-tcl-tk/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-tcl-tk.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl-tk 0.19.4-rc1\n"
+"Project-Id-Version: hello-tcl-tk 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-tcl/po/eo.po b/gettext-tools/examples/hello-tcl/po/eo.po
index 72dcab5..44845ce 100644
--- a/gettext-tools/examples/hello-tcl/po/eo.po
+++ b/gettext-tools/examples/hello-tcl/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.15-pre5\n"
+"Project-Id-Version: hello-tcl 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-tcl/po/hr.po b/gettext-tools/examples/hello-tcl/po/hr.po
index 7621bbd..9d5278f 100644
--- a/gettext-tools/examples/hello-tcl/po/hr.po
+++ b/gettext-tools/examples/hello-tcl/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.18\n"
+"Project-Id-Version: hello-tcl 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.tcl:11
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-tcl/po/sv.po b/gettext-tools/examples/hello-tcl/po/sv.po
index 48501f9..1d5e240 100644
--- a/gettext-tools/examples/hello-tcl/po/sv.po
+++ b/gettext-tools/examples/hello-tcl/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-tcl.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-tcl 0.19.4-rc1\n"
+"Project-Id-Version: hello-tcl 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-ycp/po/eo.po b/gettext-tools/examples/hello-ycp/po/eo.po
index ddad31e..7197ea0 100644
--- a/gettext-tools/examples/hello-ycp/po/eo.po
+++ b/gettext-tools/examples/hello-ycp/po/eo.po
@@ -1,14 +1,15 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.15-pre5\n"
+"Project-Id-Version: hello-ycp 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/hello-ycp/po/hr.po b/gettext-tools/examples/hello-ycp/po/hr.po
index 9deacd0..8b43af9 100644
--- a/gettext-tools/examples/hello-ycp/po/hr.po
+++ b/gettext-tools/examples/hello-ycp/po/hr.po
@@ -5,17 +5,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.18\n"
+"Project-Id-Version: hello-ycp 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello.ycp:15
 msgid "Hello, world!"
diff --git a/gettext-tools/examples/hello-ycp/po/sv.po b/gettext-tools/examples/hello-ycp/po/sv.po
index ad918cd..2101f57 100644
--- a/gettext-tools/examples/hello-ycp/po/sv.po
+++ b/gettext-tools/examples/hello-ycp/po/sv.po
@@ -1,13 +1,17 @@
 # Swedish messages for hello-ycp.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: hello-ycp 0.19.4-rc1\n"
+"Project-Id-Version: hello-ycp 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am
index cd9b365..d4f1ad6 100644
--- a/gettext-tools/examples/po/Makefile.am
+++ b/gettext-tools/examples/po/Makefile.am
@@ -1,5 +1,6 @@
 ## Makefile for the gettext-tools/examples/po subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2007, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2007, 2009, 2016 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
diff --git a/gettext-tools/examples/po/af.po b/gettext-tools/examples/po/af.po
index 8fe6794..75dc269 100644
--- a/gettext-tools/examples/po/af.po
+++ b/gettext-tools/examples/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2003-12-31 10:30+2\n"
 "Last-Translator: Ysbeer <ysbeer@af.org.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
diff --git a/gettext-tools/examples/po/ast.po b/gettext-tools/examples/po/ast.po
index 11611c8..d0eedd2 100644
--- a/gettext-tools/examples/po/ast.po
+++ b/gettext-tools/examples/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2009-12-15 12:16+0100\n"
 "Last-Translator: Marquinos <maacub@gmail.com>\n"
 "Language-Team: Asturian <ubuntu-l10n-ast@lists.ubuntu.com>\n"
diff --git a/gettext-tools/examples/po/bg.po b/gettext-tools/examples/po/bg.po
index 00a9459..f9c8dac 100644
--- a/gettext-tools/examples/po/bg.po
+++ b/gettext-tools/examples/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-24 08:27+0300\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
diff --git a/gettext-tools/examples/po/ca.po b/gettext-tools/examples/po/ca.po
index 5909754..261118b 100644
--- a/gettext-tools/examples/po/ca.po
+++ b/gettext-tools/examples/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-24 18:48+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
diff --git a/gettext-tools/examples/po/cs.po b/gettext-tools/examples/po/cs.po
index 194a194..92afbda 100644
--- a/gettext-tools/examples/po/cs.po
+++ b/gettext-tools/examples/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-26 08:43+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/da.po b/gettext-tools/examples/po/da.po
index 25728ae..d971056 100644
--- a/gettext-tools/examples/po/da.po
+++ b/gettext-tools/examples/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-27 12:39+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
diff --git a/gettext-tools/examples/po/de.po b/gettext-tools/examples/po/de.po
index 8d40737..4a33aad 100644
--- a/gettext-tools/examples/po/de.po
+++ b/gettext-tools/examples/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-26 13:05+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/el.po b/gettext-tools/examples/po/el.po
index 7cd931d..6364474 100644
--- a/gettext-tools/examples/po/el.po
+++ b/gettext-tools/examples/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2005-01-06 18:50+0000\n"
 "Last-Translator: Simos Xenitellis <simos74@gmx.net>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
diff --git a/gettext-tools/examples/po/eo.po b/gettext-tools/examples/po/eo.po
index c2827bb..023b105 100644
--- a/gettext-tools/examples/po/eo.po
+++ b/gettext-tools/examples/po/eo.po
@@ -1,15 +1,16 @@
 # La teksto por la mesa�oj de la programo "gettext".
-# Copyright (C) 2006 Yoyodyne, Inc.
+# Copyright (C) 2006, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2006.
+# Felipe CASTRO <fefcas@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.15-pre5\n"
+"Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
-"PO-Revision-Date: 2006-07-02 19:24+0100\n"
-"Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
+"PO-Revision-Date: 2016-02-22 08:54-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
@@ -45,39 +46,41 @@ msgid "This program is running as process number %d."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero %d."
 
 #: hello-c-gnome3/hello.c:79
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<big>Hello world!</big>\n"
 "This program is running as process number <b>%d</b>."
-msgstr "Ĉi tiu programo rulas kiel procezo kun numero %d."
+msgstr ""
+"<big>Saluton mondo!</big>\n"
+"Ĉi tiu programo rulas kiel procezo kun numero <b>%d</b>."
 
 #: hello-c-gnome3/hello.c:84
 msgid "<big><u>This is another text</u></big>"
-msgstr ""
+msgstr "<big><u>Tio ĉi estas alia teksto</u></big>"
 
 #: hello-c-gnome3/hello.c:86
 msgid "<big><i>This is yet another text</i></big>"
-msgstr ""
+msgstr "<big><i>Tio ĉi estas pli alia teksto</i></big>"
 
 #: hello-c-gnome3/hello.desktop.in.in:4
 msgid "Hello"
-msgstr ""
+msgstr "Saluton"
 
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
-msgstr ""
+msgstr "Ekzempla aplikaĵo"
 
 #: hello-c-gnome3/hello.ui:33
 msgid "Update text"
-msgstr ""
+msgstr "Äœisdatigi tekston"
 
 #: hello-c-gnome3/hello.gschema.xml:7
 msgid "Use XML markup"
-msgstr ""
+msgstr "Uzi marklingvon XML"
 
 #: hello-c-gnome3/hello.gschema.xml:8
 msgid "Whether to use XML markup in the text."
-msgstr ""
+msgstr "Ĉu uzi marklingvon XML en la teksto."
 
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
@@ -87,7 +90,7 @@ msgstr "Ĉi tiu programo rulas kiel procezo kun numero %1."
 
 #: hello-c++-kde/hello.cc:46
 msgid "Hello example"
-msgstr "Saluto-ekzemplo"
+msgstr "Saluton-ekzemplo"
 
 #: hello-c++-kde/hello.cc:48
 msgid "Hello world example"
diff --git a/gettext-tools/examples/po/es.po b/gettext-tools/examples/po/es.po
index fb3351f..a826f46 100644
--- a/gettext-tools/examples/po/es.po
+++ b/gettext-tools/examples/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-23 22:44+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
diff --git a/gettext-tools/examples/po/fi.po b/gettext-tools/examples/po/fi.po
index 2a26e45..67ee5c7 100644
--- a/gettext-tools/examples/po/fi.po
+++ b/gettext-tools/examples/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-09-01 16:59+0300\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/fr.po b/gettext-tools/examples/po/fr.po
index 9e08d1d..d3d17c4 100644
--- a/gettext-tools/examples/po/fr.po
+++ b/gettext-tools/examples/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-12-22 23:54+0100\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
diff --git a/gettext-tools/examples/po/ga.po b/gettext-tools/examples/po/ga.po
index 871e409..e979c7c 100644
--- a/gettext-tools/examples/po/ga.po
+++ b/gettext-tools/examples/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2005-02-07 12:09-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: Irish <ga@li.org>\n"
diff --git a/gettext-tools/examples/po/gettext-examples.pot b/gettext-tools/examples/po/gettext-examples.pot
index b73a7fe..c60c0cb 100644
--- a/gettext-tools/examples/po/gettext-examples.pot
+++ b/gettext-tools/examples/po/gettext-examples.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/gl.po b/gettext-tools/examples/po/gl.po
index a0a604f..1123c01 100644
--- a/gettext-tools/examples/po/gl.po
+++ b/gettext-tools/examples/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2014-05-10 16:34+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
diff --git a/gettext-tools/examples/po/hello-c++-gnome.pot b/gettext-tools/examples/po/hello-c++-gnome.pot
index 9731638..5cc5085 100644
--- a/gettext-tools/examples/po/hello-c++-gnome.pot
+++ b/gettext-tools/examples/po/hello-c++-gnome.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-c++-kde.pot b/gettext-tools/examples/po/hello-c++-kde.pot
index 945c074..df36fd5 100644
--- a/gettext-tools/examples/po/hello-c++-kde.pot
+++ b/gettext-tools/examples/po/hello-c++-kde.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-c++-qt.pot b/gettext-tools/examples/po/hello-c++-qt.pot
index de78424..7636aa8 100644
--- a/gettext-tools/examples/po/hello-c++-qt.pot
+++ b/gettext-tools/examples/po/hello-c++-qt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-c++-qt 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-c++-wxwidgets.pot b/gettext-tools/examples/po/hello-c++-wxwidgets.pot
index 90315db..2d4213b 100644
--- a/gettext-tools/examples/po/hello-c++-wxwidgets.pot
+++ b/gettext-tools/examples/po/hello-c++-wxwidgets.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-c++-wxwidgets 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-c++.pot b/gettext-tools/examples/po/hello-c++.pot
index 9bf810c..1995f92 100644
--- a/gettext-tools/examples/po/hello-c++.pot
+++ b/gettext-tools/examples/po/hello-c++.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-c-gnome.pot b/gettext-tools/examples/po/hello-c-gnome.pot
index c72a916..4ad72db 100644
--- a/gettext-tools/examples/po/hello-c-gnome.pot
+++ b/gettext-tools/examples/po/hello-c-gnome.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-c-gnome3.pot b/gettext-tools/examples/po/hello-c-gnome3.pot
index 5c85339..de4d94b 100644
--- a/gettext-tools/examples/po/hello-c-gnome3.pot
+++ b/gettext-tools/examples/po/hello-c-gnome3.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-c-gnome3 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-c.pot b/gettext-tools/examples/po/hello-c.pot
index dec7359..4e248a2 100644
--- a/gettext-tools/examples/po/hello-c.pot
+++ b/gettext-tools/examples/po/hello-c.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-clisp.pot b/gettext-tools/examples/po/hello-clisp.pot
index c810107..cfa1e71 100644
--- a/gettext-tools/examples/po/hello-clisp.pot
+++ b/gettext-tools/examples/po/hello-clisp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-clisp 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-csharp-forms.pot b/gettext-tools/examples/po/hello-csharp-forms.pot
index 8cf6551..f7a14a5 100644
--- a/gettext-tools/examples/po/hello-csharp-forms.pot
+++ b/gettext-tools/examples/po/hello-csharp-forms.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-csharp-forms 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-csharp.pot b/gettext-tools/examples/po/hello-csharp.pot
index 5c43950..0aabada 100644
--- a/gettext-tools/examples/po/hello-csharp.pot
+++ b/gettext-tools/examples/po/hello-csharp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-csharp 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-gawk.pot b/gettext-tools/examples/po/hello-gawk.pot
index f6c1d56..bc9f619 100644
--- a/gettext-tools/examples/po/hello-gawk.pot
+++ b/gettext-tools/examples/po/hello-gawk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-gawk 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-guile.pot b/gettext-tools/examples/po/hello-guile.pot
index fe05277..1f4a395 100644
--- a/gettext-tools/examples/po/hello-guile.pot
+++ b/gettext-tools/examples/po/hello-guile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-guile 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-java-awt.pot b/gettext-tools/examples/po/hello-java-awt.pot
index 1b9aa11..f4fed74 100644
--- a/gettext-tools/examples/po/hello-java-awt.pot
+++ b/gettext-tools/examples/po/hello-java-awt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-java-awt 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-java-qtjambi.pot b/gettext-tools/examples/po/hello-java-qtjambi.pot
index 97eb3f6..bf3f1b0 100644
--- a/gettext-tools/examples/po/hello-java-qtjambi.pot
+++ b/gettext-tools/examples/po/hello-java-qtjambi.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-java-qtjambi 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-java-swing.pot b/gettext-tools/examples/po/hello-java-swing.pot
index d3cbb19..943ba2f 100644
--- a/gettext-tools/examples/po/hello-java-swing.pot
+++ b/gettext-tools/examples/po/hello-java-swing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-java-swing 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-java.pot b/gettext-tools/examples/po/hello-java.pot
index 977b005..3f9952b 100644
--- a/gettext-tools/examples/po/hello-java.pot
+++ b/gettext-tools/examples/po/hello-java.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-java 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-librep.pot b/gettext-tools/examples/po/hello-librep.pot
index 0c01f6e..f2ec305 100644
--- a/gettext-tools/examples/po/hello-librep.pot
+++ b/gettext-tools/examples/po/hello-librep.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-librep 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-objc-gnome.pot b/gettext-tools/examples/po/hello-objc-gnome.pot
index 382cf41..46bf50c 100644
--- a/gettext-tools/examples/po/hello-objc-gnome.pot
+++ b/gettext-tools/examples/po/hello-objc-gnome.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-objc-gnustep.pot b/gettext-tools/examples/po/hello-objc-gnustep.pot
index 15d75b6..c2d34ab 100644
--- a/gettext-tools/examples/po/hello-objc-gnustep.pot
+++ b/gettext-tools/examples/po/hello-objc-gnustep.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Hello \n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-objc.pot b/gettext-tools/examples/po/hello-objc.pot
index b352f6b..0104580 100644
--- a/gettext-tools/examples/po/hello-objc.pot
+++ b/gettext-tools/examples/po/hello-objc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-pascal.pot b/gettext-tools/examples/po/hello-pascal.pot
index 8c88d52..c1d1edc 100644
--- a/gettext-tools/examples/po/hello-pascal.pot
+++ b/gettext-tools/examples/po/hello-pascal.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-pascal 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-perl.pot b/gettext-tools/examples/po/hello-perl.pot
index 9f756ad..d1bdccd 100644
--- a/gettext-tools/examples/po/hello-perl.pot
+++ b/gettext-tools/examples/po/hello-perl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-perl 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-php.pot b/gettext-tools/examples/po/hello-php.pot
index 6456731..aaefd34 100644
--- a/gettext-tools/examples/po/hello-php.pot
+++ b/gettext-tools/examples/po/hello-php.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-php 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-python.pot b/gettext-tools/examples/po/hello-python.pot
index dbc8f66..ad3ec00 100644
--- a/gettext-tools/examples/po/hello-python.pot
+++ b/gettext-tools/examples/po/hello-python.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-python 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-sh.pot b/gettext-tools/examples/po/hello-sh.pot
index 7c283a9..8bde061 100644
--- a/gettext-tools/examples/po/hello-sh.pot
+++ b/gettext-tools/examples/po/hello-sh.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-sh 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-smalltalk.pot b/gettext-tools/examples/po/hello-smalltalk.pot
index 5e1572d..bae9df7 100644
--- a/gettext-tools/examples/po/hello-smalltalk.pot
+++ b/gettext-tools/examples/po/hello-smalltalk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-smalltalk 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:27+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-tcl-tk.pot b/gettext-tools/examples/po/hello-tcl-tk.pot
index 30ff37a..bd395a4 100644
--- a/gettext-tools/examples/po/hello-tcl-tk.pot
+++ b/gettext-tools/examples/po/hello-tcl-tk.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-tcl-tk 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-tcl.pot b/gettext-tools/examples/po/hello-tcl.pot
index a8f1232..ba43081 100644
--- a/gettext-tools/examples/po/hello-tcl.pot
+++ b/gettext-tools/examples/po/hello-tcl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-tcl 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hello-ycp.pot b/gettext-tools/examples/po/hello-ycp.pot
index 67eebd7..04df08b 100644
--- a/gettext-tools/examples/po/hello-ycp.pot
+++ b/gettext-tools/examples/po/hello-ycp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hello-ycp 0\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:09+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/gettext-tools/examples/po/hr.po b/gettext-tools/examples/po/hr.po
index a0333a2..cfd1873 100644
--- a/gettext-tools/examples/po/hr.po
+++ b/gettext-tools/examples/po/hr.po
@@ -5,18 +5,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.18\n"
+"Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
-"PO-Revision-Date: 2012-07-04 18:38+0200\n"
-"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
+"PO-Revision-Date: 2016-04-01 11:04-0700\n"
+"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46
 #: hello-c-gnome3/hello.desktop.in.in:5 hello-c++/hello.cc:39
@@ -47,39 +48,41 @@ msgid "This program is running as process number %d."
 msgstr "Ovaj program je pokrenut kao proces broj %d."
 
 #: hello-c-gnome3/hello.c:79
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<big>Hello world!</big>\n"
 "This program is running as process number <b>%d</b>."
-msgstr "Ovaj program je pokrenut kao proces broj %d."
+msgstr ""
+"<big>Pozdrav, svijete!</big>\n"
+"Ovaj program je pokrenut kao proces broj <b>%d</b>."
 
 #: hello-c-gnome3/hello.c:84
 msgid "<big><u>This is another text</u></big>"
-msgstr ""
+msgstr "<big><u>Ovo je jedan drugi tekst</u></big>"
 
 #: hello-c-gnome3/hello.c:86
 msgid "<big><i>This is yet another text</i></big>"
-msgstr ""
+msgstr "<big><i>A ovo je još jedan drugi tekst</i></big>"
 
 #: hello-c-gnome3/hello.desktop.in.in:4
 msgid "Hello"
-msgstr ""
+msgstr "Pozdrav"
 
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
-msgstr ""
+msgstr "Primjer uporabe"
 
 #: hello-c-gnome3/hello.ui:33
 msgid "Update text"
-msgstr ""
+msgstr "Ažuriranje teksta"
 
 #: hello-c-gnome3/hello.gschema.xml:7
 msgid "Use XML markup"
-msgstr ""
+msgstr "Uporaba XML oznaka"
 
 #: hello-c-gnome3/hello.gschema.xml:8
 msgid "Whether to use XML markup in the text."
-msgstr ""
+msgstr "Da li upotrijebiti XML oznake u tekstu."
 
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
diff --git a/gettext-tools/examples/po/hu.po b/gettext-tools/examples/po/hu.po
index 834f3f5..a20a42e 100644
--- a/gettext-tools/examples/po/hu.po
+++ b/gettext-tools/examples/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-23 20:31+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/id.po b/gettext-tools/examples/po/id.po
index 9ee0142..d3359cb 100644
--- a/gettext-tools/examples/po/id.po
+++ b/gettext-tools/examples/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2006-09-27 20:19+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_heriyanto@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/it.po b/gettext-tools/examples/po/it.po
index c483890..015bd7f 100644
--- a/gettext-tools/examples/po/it.po
+++ b/gettext-tools/examples/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-08-05 12:18+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
diff --git a/gettext-tools/examples/po/ja.po b/gettext-tools/examples/po/ja.po
index d6b923f..2569ce8 100644
--- a/gettext-tools/examples/po/ja.po
+++ b/gettext-tools/examples/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-24 12:14+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/ky.po b/gettext-tools/examples/po/ky.po
index e81b7c9..e2234b7 100644
--- a/gettext-tools/examples/po/ky.po
+++ b/gettext-tools/examples/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2007-11-13 16:02+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kirghiz <i18n-team-ky-kyrgyz@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/lv.po b/gettext-tools/examples/po/lv.po
index d1b0df3..cf5c3fb 100644
--- a/gettext-tools/examples/po/lv.po
+++ b/gettext-tools/examples/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2009-07-28 21:26+0100\n"
 "Last-Translator: Rihards Priedītis <rprieditis@gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/ms.po b/gettext-tools/examples/po/ms.po
index 644cffe..1240203 100644
--- a/gettext-tools/examples/po/ms.po
+++ b/gettext-tools/examples/po/ms.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-25 20:48+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@gmail.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/mt.po b/gettext-tools/examples/po/mt.po
index 7ab6c85..beb1d45 100644
--- a/gettext-tools/examples/po/mt.po
+++ b/gettext-tools/examples/po/mt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2008-11-18 17:27+0100\n"
 "Last-Translator: Clyde Meli <cmeli@cis.um.edu.mt>\n"
 "Language-Team: Maltese <translation-team-mt@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/nb.po b/gettext-tools/examples/po/nb.po
index ca20373..3cfebba 100644
--- a/gettext-tools/examples/po/nb.po
+++ b/gettext-tools/examples/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-09-19 00:04+0100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
diff --git a/gettext-tools/examples/po/nl.po b/gettext-tools/examples/po/nl.po
index 0f9d91b..c0936b9 100644
--- a/gettext-tools/examples/po/nl.po
+++ b/gettext-tools/examples/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-07-01 21:10+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
diff --git a/gettext-tools/examples/po/pl.po b/gettext-tools/examples/po/pl.po
index cacbfe0..8337c18 100644
--- a/gettext-tools/examples/po/pl.po
+++ b/gettext-tools/examples/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-23 22:01+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/pt.po b/gettext-tools/examples/po/pt.po
index f1f3eca..a33ee60 100644
--- a/gettext-tools/examples/po/pt.po
+++ b/gettext-tools/examples/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2005-11-19 23:08+0000\n"
 "Last-Translator: Helder Correia <helder.pereira.correia@gmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/pt_BR.po b/gettext-tools/examples/po/pt_BR.po
index 40a8548..190f62c 100644
--- a/gettext-tools/examples/po/pt_BR.po
+++ b/gettext-tools/examples/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-09-15 11:27-0300\n"
 "Last-Translator: Rafael Ferreira <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
diff --git a/gettext-tools/examples/po/ro.po b/gettext-tools/examples/po/ro.po
index a1f6f64..5b13289 100644
--- a/gettext-tools/examples/po/ro.po
+++ b/gettext-tools/examples/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-23 23:05+0200\n"
 "Last-Translator: Mihai Cristescu <mihai.cristescu@archlinux.info>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/ru.po b/gettext-tools/examples/po/ru.po
index 0101006..6731eda 100644
--- a/gettext-tools/examples/po/ru.po
+++ b/gettext-tools/examples/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-26 08:55+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
diff --git a/gettext-tools/examples/po/sk.po b/gettext-tools/examples/po/sk.po
index 8b7c561..6a367ce 100644
--- a/gettext-tools/examples/po/sk.po
+++ b/gettext-tools/examples/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-23 20:17+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
diff --git a/gettext-tools/examples/po/sl.po b/gettext-tools/examples/po/sl.po
index 100746c..7cfccbd 100644
--- a/gettext-tools/examples/po/sl.po
+++ b/gettext-tools/examples/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-28 10:37+0200\n"
 "Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/sr.po b/gettext-tools/examples/po/sr.po
index 6546f01..76eab83 100644
--- a/gettext-tools/examples/po/sr.po
+++ b/gettext-tools/examples/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-12-23 19:12+0200\n"
 "Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
diff --git a/gettext-tools/examples/po/sv.po b/gettext-tools/examples/po/sv.po
index 038f0d8..393743e 100644
--- a/gettext-tools/examples/po/sv.po
+++ b/gettext-tools/examples/po/sv.po
@@ -1,14 +1,18 @@
 # Swedish messages for gettext-examples.
-# Copyright © 2006, 2014 Yoyodyne, Inc. (msgids)
+# Copyright © 2006, 2014, 2016 Yoyodyne, Inc. (msgids)
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016
+#
+# $Revision: 1.2 $
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.19.4-rc1\n"
+"Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
-"PO-Revision-Date: 2014-12-23 09:18+0100\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
+"PO-Revision-Date: 2016-05-26 22:46+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -44,19 +48,21 @@ msgid "This program is running as process number %d."
 msgstr "Detta program kör som process nummer %d."
 
 #: hello-c-gnome3/hello.c:79
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<big>Hello world!</big>\n"
 "This program is running as process number <b>%d</b>."
-msgstr "Detta program kör som process nummer %d."
+msgstr ""
+"<big>Hej världen!</big>\n"
+"Detta program kör som process nummer <b>%d</b>."
 
 #: hello-c-gnome3/hello.c:84
 msgid "<big><u>This is another text</u></big>"
-msgstr ""
+msgstr "<big><u>Detta är en annan text</u></big>"
 
 #: hello-c-gnome3/hello.c:86
 msgid "<big><i>This is yet another text</i></big>"
-msgstr ""
+msgstr "<big><i>Detta är ytterligare en annan text</i></big>"
 
 #: hello-c-gnome3/hello.desktop.in.in:4
 msgid "Hello"
@@ -68,15 +74,15 @@ msgstr "Exempelprogram"
 
 #: hello-c-gnome3/hello.ui:33
 msgid "Update text"
-msgstr ""
+msgstr "Uppdatera text"
 
 #: hello-c-gnome3/hello.gschema.xml:7
 msgid "Use XML markup"
-msgstr ""
+msgstr "Använd XML-märkning"
 
 #: hello-c-gnome3/hello.gschema.xml:8
 msgid "Whether to use XML markup in the text."
-msgstr ""
+msgstr "Huruvida XML-märkning skall användas i texten."
 
 #: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
 #: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
@@ -90,7 +96,7 @@ msgstr "Hälsningsexempel"
 
 #: hello-c++-kde/hello.cc:48
 msgid "Hello world example"
-msgstr "\"Hej världen\"-exempel"
+msgstr "Hej världen-exempel"
 
 #: hello-sh/hello.sh:17
 #, sh-format
@@ -118,9 +124,3 @@ msgstr "Detta program kör som process nummer {0}."
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Detta program kör som process nummer {pid}."
-
-#~ msgid "Set label sensitive"
-#~ msgstr "Sätt etikett aktiv"
-
-#~ msgid "Whether to set the label sensitive."
-#~ msgstr "Om etikett ska sättas aktiv"
diff --git a/gettext-tools/examples/po/tr.po b/gettext-tools/examples/po/tr.po
index e65327f..7fedf4d 100644
--- a/gettext-tools/examples/po/tr.po
+++ b/gettext-tools/examples/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2004-01-21 06:17+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/uk.po b/gettext-tools/examples/po/uk.po
index 3ebbebb..c82a760 100644
--- a/gettext-tools/examples/po/uk.po
+++ b/gettext-tools/examples/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-23 20:51+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/vi.po b/gettext-tools/examples/po/vi.po
index c722926..b2db9dc 100644
--- a/gettext-tools/examples/po/vi.po
+++ b/gettext-tools/examples/po/vi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-06-30 08:00+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
diff --git a/gettext-tools/examples/po/zh_CN.po b/gettext-tools/examples/po/zh_CN.po
index 3b7422e..ea73113 100644
--- a/gettext-tools/examples/po/zh_CN.po
+++ b/gettext-tools/examples/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-09-01 09:53中国标准时间\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
diff --git a/gettext-tools/examples/po/zh_HK.po b/gettext-tools/examples/po/zh_HK.po
index 26d37db..4c9d092 100644
--- a/gettext-tools/examples/po/zh_HK.po
+++ b/gettext-tools/examples/po/zh_HK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2006-07-05 15:40+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
diff --git a/gettext-tools/examples/po/zh_TW.po b/gettext-tools/examples/po/zh_TW.po
index dc9bad2..1c8358f 100644
--- a/gettext-tools/examples/po/zh_TW.po
+++ b/gettext-tools/examples/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:28+0900\n"
+"POT-Creation-Date: 2016-06-11 22:10+0900\n"
 "PO-Revision-Date: 2015-10-08 13:00+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am
index 9e43721..25c9cc1 100644
--- a/gettext-tools/gnulib-lib/Makefile.am
+++ b/gettext-tools/gnulib-lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/gnulib-lib subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2006, 2009, 2015 Free Software
+## Copyright (C) 1995-1998, 2000-2006, 2009, 2015-2016 Free Software
 ## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
@@ -61,6 +61,11 @@ include Makefile.gnulib
 # Which classes to export from the shared library.
 MOOPPFLAGS += --dllexport=styled_ostream
 
+# OS/2 does not support a DLL name longer than 8 characters.
+if OS2
+libgettextlib_la_LDFLAGS += -os2dllname gtlib
+endif
+
 # Linking with C++ libraries is needed _only_ on mingw and Cygwin.
 if !WOE32DLL
 libgettextlib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
diff --git a/gettext-tools/gnulib-lib/Makefile.gnulib b/gettext-tools/gnulib-lib/Makefile.gnulib
index 1a63a0a..438bf9d 100644
--- a/gettext-tools/gnulib-lib/Makefile.gnulib
+++ b/gettext-tools/gnulib-lib/Makefile.gnulib
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --local-dir=gnulib-local --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=../build-aux --with-tests --avoid=hash-tests --avoid=unilbrk/u8-possible-linebreaks-tests --avoid=unilbrk/ulc-width-linebreaks-tests --avoid=unistr/u8-mbtouc-tests --avoid=unistr/u8-mbtouc-unsafe-tests --avoid=uniwidth/width-tests --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca-opt ansi-c++-opt atexit backupfile basename binary-io bison-i18n byteswap c-ctype c-strcase c-strcasestr c-strstr clean-temp closedir closeout copy-file csharpcomp csharpcomp-script csharpexec csharpexec-script error error-progname execute extensions fd-ostream file-ostream filename findprog fnmatch fopen fstrcmp full-write fwriteerror gcd gcj getline getopt-gnu gettext-h gettext-tools-misc hash html-styled-ostream iconv include_next java javacomp javacomp-script javaexec javaexec-script libunistring-optional localcharset locale localename lock malloc-posix mbrtowc mbsinit memmove memset minmax multiarch obstack open opendir openmp ostream pipe-filter-ii progname propername readdir relocatable-prog relocatable-script setlocale sh-quote sigpipe sigprocmask snippet/arg-nonnull snippet/c++defs snippet/warn-on-use spawn-pipe ssize_t stdbool stddef stdint stdio stdlib stpcpy stpncpy strcspn streq strerror strpbrk strtol strtoul styled-ostream sys_select sys_stat sys_time term-styled-ostream trim unictype/ctype-space unilbrk/ulc-width-linebreaks uniname/uniname unistd unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-mbtoucr unistr/u8-uctomb uniwidth/width unlocked-io vasprintf verify wait-process wchar wctype-h write xalloc xconcat-filename xerror xmalloca xsetenv xstriconv xstriconveh xvasprintf
+# Reproduce by: gnulib-tool --import --local-dir=gnulib-local --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=../build-aux --with-tests --avoid=hash-tests --avoid=unilbrk/u8-possible-linebreaks-tests --avoid=unilbrk/ulc-width-linebreaks-tests --avoid=unistr/u8-mbtouc-tests --avoid=unistr/u8-mbtouc-unsafe-tests --avoid=uniwidth/width-tests --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca-opt ansi-c++-opt atexit backupfile basename binary-io bison-i18n byteswap c-ctype c-strcase c-strcasestr c-strstr clean-temp closedir closeout copy-file csharpcomp csharpcomp-script csharpexec csharpexec-script error error-progname execute extensions fd-ostream file-ostream filename findprog fnmatch fopen fstrcmp full-write fwriteerror gcd gcj getline getopt-gnu gettext gettext-h gettext-tools-misc hash html-styled-ostream iconv include_next java javacomp javacomp-script javaexec javaexec-script libunistring-optional localcharset locale localename lock malloc-posix mbrtowc mbsinit memmove memset minmax multiarch obstack open opendir openmp ostream pipe-filter-ii progname propername readdir relocatable-prog relocatable-script setlocale sh-quote sigpipe sigprocmask snippet/arg-nonnull snippet/c++defs snippet/warn-on-use spawn-pipe ssize_t stdbool stddef stdint stdio stdlib stpcpy stpncpy strcspn streq strerror strpbrk strtol strtoul styled-ostream sys_select sys_stat sys_time term-styled-ostream trim unictype/ctype-space unilbrk/ulc-width-linebreaks uniname/uniname unistd unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-mbtoucr unistr/u8-uctomb uniwidth/width unlocked-io vasprintf verify wait-process wchar wctype-h write xalloc xconcat-filename xerror xmalloca xmemdup0 xsetenv xstriconv xstriconveh xvasprintf
 
 
 MOSTLYCLEANFILES += core *.stackdump
@@ -420,6 +420,15 @@ EXTRA_DIST += dirent.in.h
 
 ## end   gnulib module dirent
 
+## begin gnulib module dirfd
+
+
+EXTRA_DIST += dirfd.c
+
+EXTRA_libgettextlib_la_SOURCES += dirfd.c
+
+## end   gnulib module dirfd
+
 ## begin gnulib module dosname
 
 
@@ -862,6 +871,14 @@ V_GPERF_0 = @echo "  GPERF   " $@;
 
 ## end   gnulib module gperf
 
+## begin gnulib module hard-locale
+
+libgettextlib_la_SOURCES += hard-locale.c
+
+EXTRA_DIST += hard-locale.h
+
+## end   gnulib module hard-locale
+
 ## begin gnulib module hash
 
 libgettextlib_la_SOURCES += hash.h hash.c
@@ -4704,6 +4721,15 @@ EXTRA_DIST += xmalloca.h
 
 ## end   gnulib module xmalloca
 
+## begin gnulib module xmemdup0
+
+
+EXTRA_DIST += xmemdup0.c xmemdup0.h
+
+EXTRA_libgettextlib_la_SOURCES += xmemdup0.c
+
+## end   gnulib module xmemdup0
+
 ## begin gnulib module xreadlink
 
 libgettextlib_la_SOURCES += xreadlink.c
diff --git a/gettext-tools/gnulib-lib/Makefile.in b/gettext-tools/gnulib-lib/Makefile.in
index 30edf60..a8e89eb 100644
--- a/gettext-tools/gnulib-lib/Makefile.in
+++ b/gettext-tools/gnulib-lib/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --local-dir=gnulib-local --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=../build-aux --with-tests --avoid=hash-tests --avoid=unilbrk/u8-possible-linebreaks-tests --avoid=unilbrk/ulc-width-linebreaks-tests --avoid=unistr/u8-mbtouc-tests --avoid=unistr/u8-mbtouc-unsafe-tests --avoid=uniwidth/width-tests --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca-opt ansi-c++-opt atexit backupfile basename binary-io bison-i18n byteswap c-ctype c-strcase c-strcasestr c-strstr clean-temp closedir closeout copy-file csharpcomp csharpcomp-script csharpexec csharpexec-script error error-progname execute extensions fd-ostream file-ostream filename findprog fnmatch fopen fstrcmp full-write fwriteerror gcd gcj getline getopt-gnu gettext-h gettext-tools-misc hash html-styled-ostream iconv include_next java javacomp javacomp-script javaexec javaexec-script libunistring-optional localcharset locale localename lock malloc-posix mbrtowc mbsinit memmove memset minmax multiarch obstack open opendir openmp ostream pipe-filter-ii progname propername readdir relocatable-prog relocatable-script setlocale sh-quote sigpipe sigprocmask snippet/arg-nonnull snippet/c++defs snippet/warn-on-use spawn-pipe ssize_t stdbool stddef stdint stdio stdlib stpcpy stpncpy strcspn streq strerror strpbrk strtol strtoul styled-ostream sys_select sys_stat sys_time term-styled-ostream trim unictype/ctype-space unilbrk/ulc-width-linebreaks uniname/uniname unistd unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-mbtoucr unistr/u8-uctomb uniwidth/width unlocked-io vasprintf verify wait-process wchar wctype-h write xalloc xconcat-filename xerror xmalloca xsetenv xstriconv xstriconveh xvasprintf
+# Reproduce by: gnulib-tool --import --local-dir=gnulib-local --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=../build-aux --with-tests --avoid=hash-tests --avoid=unilbrk/u8-possible-linebreaks-tests --avoid=unilbrk/ulc-width-linebreaks-tests --avoid=unistr/u8-mbtouc-tests --avoid=unistr/u8-mbtouc-unsafe-tests --avoid=uniwidth/width-tests --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca-opt ansi-c++-opt atexit backupfile basename binary-io bison-i18n byteswap c-ctype c-strcase c-strcasestr c-strstr clean-temp closedir closeout copy-file csharpcomp csharpcomp-script csharpexec csharpexec-script error error-progname execute extensions fd-ostream file-ostream filename findprog fnmatch fopen fstrcmp full-write fwriteerror gcd gcj getline getopt-gnu gettext gettext-h gettext-tools-misc hash html-styled-ostream iconv include_next java javacomp javacomp-script javaexec javaexec-script libunistring-optional localcharset locale localename lock malloc-posix mbrtowc mbsinit memmove memset minmax multiarch obstack open opendir openmp ostream pipe-filter-ii progname propername readdir relocatable-prog relocatable-script setlocale sh-quote sigpipe sigprocmask snippet/arg-nonnull snippet/c++defs snippet/warn-on-use spawn-pipe ssize_t stdbool stddef stdint stdio stdlib stpcpy stpncpy strcspn streq strerror strpbrk strtol strtoul styled-ostream sys_select sys_stat sys_time term-styled-ostream trim unictype/ctype-space unilbrk/ulc-width-linebreaks uniname/uniname unistd unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-mbtoucr unistr/u8-uctomb uniwidth/width unlocked-io vasprintf verify wait-process wchar wctype-h write xalloc xconcat-filename xerror xmalloca xmemdup0 xsetenv xstriconv xstriconveh xvasprintf
 
 
 VPATH = @srcdir@
@@ -153,6 +153,9 @@ host_triplet = @host@
 @LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__append_33 = unistr/u8-prev.c
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_34 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
 @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_35 = uniwidth/width.c
+
+# OS/2 does not support a DLL name longer than 8 characters.
+@OS2_TRUE@am__append_36 = -os2dllname gtlib
 subdir = gnulib-lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -185,6 +188,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -221,6 +225,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
@@ -502,22 +507,23 @@ am__libgettextlib_la_SOURCES_DIST = copy-acl.c set-acl.c \
 	dup-safer-flag.c file-ostream.c findprog.h findprog.c \
 	fstrcmp.h fstrcmp.c full-write.h full-write.c fwriteerror.h \
 	fwriteerror.c gcd.h gcd.c gettext.h \
-	../woe32dll/gettextlib-exports.c hash.h hash.c html-ostream.c \
-	html-styled-ostream.c ../woe32dll/c++html-styled-ostream.cc \
-	javacomp.h javacomp.c javaexec.h javaexec.c javaversion.h \
-	javaversion.c gl_linkedhash_list.h gl_linkedhash_list.c \
-	gl_anyhash_list1.h gl_anyhash_list2.h gl_anylinked_list1.h \
-	gl_anylinked_list2.h gl_list.h gl_list.c localcharset.h \
-	localcharset.c localename.c glthread/lock.h glthread/lock.c \
-	malloca.c math.c mbchar.c mbiter.h mbiter.c mbslen.c mbsstr.c \
-	mbswidth.h mbswidth.c mbuiter.h mbuiter.c minmax.h ostream.c \
-	pipe-filter-ii.c pipe-filter-aux.c pipe2.c pipe2-safer.c \
-	progname.h progname.c propername.h propername.c qcopy-acl.c \
-	qset-acl.c quotearg.c safe-read.c safe-write.c sh-quote.h \
-	sh-quote.c sig-handler.c size_max.h spawn-pipe.h spawn-pipe.c \
-	striconv.h striconv.c striconveh.h striconveh.c striconveha.h \
-	striconveha.c strnlen1.h strnlen1.c styled-ostream.c \
-	tempname.c term-ostream.c term-styled-ostream.c \
+	../woe32dll/gettextlib-exports.c hard-locale.c hash.h hash.c \
+	html-ostream.c html-styled-ostream.c \
+	../woe32dll/c++html-styled-ostream.cc javacomp.h javacomp.c \
+	javaexec.h javaexec.c javaversion.h javaversion.c \
+	gl_linkedhash_list.h gl_linkedhash_list.c gl_anyhash_list1.h \
+	gl_anyhash_list2.h gl_anylinked_list1.h gl_anylinked_list2.h \
+	gl_list.h gl_list.c localcharset.h localcharset.c localename.c \
+	glthread/lock.h glthread/lock.c malloca.c math.c mbchar.c \
+	mbiter.h mbiter.c mbslen.c mbsstr.c mbswidth.h mbswidth.c \
+	mbuiter.h mbuiter.c minmax.h ostream.c pipe-filter-ii.c \
+	pipe-filter-aux.c pipe2.c pipe2-safer.c progname.h progname.c \
+	propername.h propername.c qcopy-acl.c qset-acl.c quotearg.c \
+	safe-read.c safe-write.c sh-quote.h sh-quote.c sig-handler.c \
+	size_max.h spawn-pipe.h spawn-pipe.c striconv.h striconv.c \
+	striconveh.h striconveh.c striconveha.h striconveha.c \
+	strnlen1.h strnlen1.c styled-ostream.c tempname.c \
+	term-ostream.c term-styled-ostream.c \
 	../woe32dll/c++term-styled-ostream.cc glthread/threadlib.c \
 	glthread/tls.h glthread/tls.c tmpdir.h tmpdir.c trim.c \
 	uniconv/u8-conv-from-enc.c unictype/ctype_space.c \
@@ -575,9 +581,9 @@ am_libgettextlib_la_OBJECTS = copy-acl.lo set-acl.lo \
 	execute.lo exitfail.lo fatal-signal.lo fd-hook.lo \
 	fd-ostream.lo fd-safer-flag.lo dup-safer-flag.lo \
 	file-ostream.lo findprog.lo fstrcmp.lo full-write.lo \
-	fwriteerror.lo gcd.lo $(am__objects_1) hash.lo html-ostream.lo \
-	$(am__objects_2) $(am__objects_3) javacomp.lo javaexec.lo \
-	javaversion.lo gl_linkedhash_list.lo gl_list.lo \
+	fwriteerror.lo gcd.lo $(am__objects_1) hard-locale.lo hash.lo \
+	html-ostream.lo $(am__objects_2) $(am__objects_3) javacomp.lo \
+	javaexec.lo javaversion.lo gl_linkedhash_list.lo gl_list.lo \
 	localcharset.lo localename.lo glthread/lock.lo malloca.lo \
 	math.lo mbchar.lo mbiter.lo mbslen.lo mbsstr.lo mbswidth.lo \
 	mbuiter.lo ostream.lo pipe-filter-ii.lo pipe-filter-aux.lo \
@@ -2102,8 +2108,8 @@ EXTRA_DIST = acl-internal.h acl.h acl_entries.c alignof.h alloca.in.h \
 	concat-filename.h $(top_srcdir)/../build-aux/csharpcomp.sh.in \
 	classpath.c classpath.h \
 	$(top_srcdir)/../build-aux/csharpexec.sh.in dirent.in.h \
-	dosname.h dup2.c errno.in.h error.c error.h exitfail.h fcntl.c \
-	fcntl.in.h fd-hook.h fd-ostream.h fd-ostream.c \
+	dirfd.c dosname.h dup2.c errno.in.h error.c error.h exitfail.h \
+	fcntl.c fcntl.in.h fd-hook.h fd-ostream.h fd-ostream.c \
 	fd_ostream.priv.h fd_ostream.vt.h fd-ostream.oo.c \
 	fd-ostream.oo.h file-ostream.h file-ostream.c \
 	file_ostream.priv.h file_ostream.vt.h file-ostream.oo.c \
@@ -2111,14 +2117,15 @@ EXTRA_DIST = acl-internal.h acl.h acl_entries.c alignof.h alloca.in.h \
 	fnmatch.c fnmatch.in.h fnmatch_loop.c fopen.c fstat.c \
 	getdelim.c getdtablesize.c getline.c getopt.c getopt.in.h \
 	getopt1.c getopt_int.h $(top_srcdir)/../build-aux/config.rpath \
-	gettimeofday.c $(top_srcdir)/../build-aux/config.rpath \
-	html-ostream.h html-ostream.c html_ostream.priv.h \
-	html_ostream.vt.h html-ostream.oo.c html-ostream.oo.h \
-	html-styled-ostream.h html-styled-ostream.c \
-	html_styled_ostream.priv.h html_styled_ostream.vt.h \
-	html-styled-ostream.oo.c html-styled-ostream.oo.h iconv.in.h \
-	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
-	iconv_open-osf.h iconv_open-solaris.h iconv.c iconv_close.c \
+	gettimeofday.c hard-locale.h \
+	$(top_srcdir)/../build-aux/config.rpath html-ostream.h \
+	html-ostream.c html_ostream.priv.h html_ostream.vt.h \
+	html-ostream.oo.c html-ostream.oo.h html-styled-ostream.h \
+	html-styled-ostream.c html_styled_ostream.priv.h \
+	html_styled_ostream.vt.h html-styled-ostream.oo.c \
+	html-styled-ostream.oo.h iconv.in.h iconv_open-aix.h \
+	iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h \
+	iconv_open-solaris.h iconv.c iconv_close.c \
 	iconv_open-aix.gperf iconv_open-hpux.gperf \
 	iconv_open-irix.gperf iconv_open-osf.gperf \
 	iconv_open-solaris.gperf iconv_open.c ignore-value.h \
@@ -2250,8 +2257,8 @@ EXTRA_DIST = acl-internal.h acl.h acl_entries.c alignof.h alloca.in.h \
 	printf-args.c printf-args.h printf-parse.c printf-parse.h \
 	vasnprintf.c vasnprintf.h asprintf.c vasprintf.c verify.h \
 	vsnprintf.c waitpid.c wchar.in.h wctype.in.h wcwidth.c write.c \
-	concat-filename.h xmalloca.h xreadlink.h xstriconveh.h \
-	xalloc.h
+	concat-filename.h xmalloca.h xmemdup0.c xmemdup0.h xreadlink.h \
+	xstriconveh.h xalloc.h
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
@@ -2375,91 +2382,93 @@ libgettextlib_la_SOURCES = copy-acl.c set-acl.c acl-errno-valid.c \
 	fd-ostream.c fd-safer-flag.c dup-safer-flag.c file-ostream.c \
 	findprog.h findprog.c fstrcmp.h fstrcmp.c full-write.h \
 	full-write.c fwriteerror.h fwriteerror.c gcd.h gcd.c gettext.h \
-	$(am__append_2) hash.h hash.c html-ostream.c $(am__append_5) \
-	$(am__append_6) javacomp.h javacomp.c javaexec.h javaexec.c \
-	javaversion.h javaversion.c gl_linkedhash_list.h \
-	gl_linkedhash_list.c gl_anyhash_list1.h gl_anyhash_list2.h \
-	gl_anylinked_list1.h gl_anylinked_list2.h gl_list.h gl_list.c \
-	localcharset.h localcharset.c localename.c glthread/lock.h \
-	glthread/lock.c malloca.c math.c mbchar.c mbiter.h mbiter.c \
-	mbslen.c mbsstr.c mbswidth.h mbswidth.c mbuiter.h mbuiter.c \
-	minmax.h ostream.c pipe-filter-ii.c pipe-filter-aux.c pipe2.c \
-	pipe2-safer.c progname.h progname.c propername.h propername.c \
-	qcopy-acl.c qset-acl.c quotearg.c safe-read.c safe-write.c \
-	sh-quote.h sh-quote.c sig-handler.c size_max.h spawn-pipe.h \
-	spawn-pipe.c w32spawn.h striconv.h striconv.c striconveh.h \
-	striconveh.c striconveha.h striconveha.c strnlen1.h strnlen1.c \
-	styled-ostream.c tempname.c term-ostream.c $(am__append_19) \
-	$(am__append_20) glthread/threadlib.c glthread/tls.h \
-	glthread/tls.c tmpdir.h tmpdir.c trim.c $(am__append_21) \
-	$(am__append_22) unilbrk/lbrktables.c $(am__append_23) \
-	$(am__append_24) unilbrk/ulc-common.c $(am__append_25) \
-	$(am__append_26) unistd.c dup-safer.c fd-safer.c pipe-safer.c \
-	$(am__append_27) $(am__append_28) $(am__append_29) \
-	$(am__append_30) $(am__append_31) $(am__append_32) \
-	$(am__append_33) $(am__append_34) $(am__append_35) \
-	wait-process.h wait-process.c wctype-h.c xalloc.h xmalloc.c \
-	xstrdup.c xconcat-filename.c xerror.h xerror.c gl_xlist.h \
-	gl_xlist.c xmalloca.c xreadlink.c xsetenv.h xsetenv.c xsize.h \
-	xsize.c xstriconv.h xstriconv.c xstriconveh.c xvasprintf.h \
+	$(am__append_2) hard-locale.c hash.h hash.c html-ostream.c \
+	$(am__append_5) $(am__append_6) javacomp.h javacomp.c \
+	javaexec.h javaexec.c javaversion.h javaversion.c \
+	gl_linkedhash_list.h gl_linkedhash_list.c gl_anyhash_list1.h \
+	gl_anyhash_list2.h gl_anylinked_list1.h gl_anylinked_list2.h \
+	gl_list.h gl_list.c localcharset.h localcharset.c localename.c \
+	glthread/lock.h glthread/lock.c malloca.c math.c mbchar.c \
+	mbiter.h mbiter.c mbslen.c mbsstr.c mbswidth.h mbswidth.c \
+	mbuiter.h mbuiter.c minmax.h ostream.c pipe-filter-ii.c \
+	pipe-filter-aux.c pipe2.c pipe2-safer.c progname.h progname.c \
+	propername.h propername.c qcopy-acl.c qset-acl.c quotearg.c \
+	safe-read.c safe-write.c sh-quote.h sh-quote.c sig-handler.c \
+	size_max.h spawn-pipe.h spawn-pipe.c w32spawn.h striconv.h \
+	striconv.c striconveh.h striconveh.c striconveha.h \
+	striconveha.c strnlen1.h strnlen1.c styled-ostream.c \
+	tempname.c term-ostream.c $(am__append_19) $(am__append_20) \
+	glthread/threadlib.c glthread/tls.h glthread/tls.c tmpdir.h \
+	tmpdir.c trim.c $(am__append_21) $(am__append_22) \
+	unilbrk/lbrktables.c $(am__append_23) $(am__append_24) \
+	unilbrk/ulc-common.c $(am__append_25) $(am__append_26) \
+	unistd.c dup-safer.c fd-safer.c pipe-safer.c $(am__append_27) \
+	$(am__append_28) $(am__append_29) $(am__append_30) \
+	$(am__append_31) $(am__append_32) $(am__append_33) \
+	$(am__append_34) $(am__append_35) wait-process.h \
+	wait-process.c wctype-h.c xalloc.h xmalloc.c xstrdup.c \
+	xconcat-filename.c xerror.h xerror.c gl_xlist.h gl_xlist.c \
+	xmalloca.c xreadlink.c xsetenv.h xsetenv.c xsize.h xsize.c \
+	xstriconv.h xstriconv.c xstriconveh.c xvasprintf.h \
 	xvasprintf.c xasprintf.c
 libgettextlib_la_LIBADD = $(gl_LTLIBOBJS) $(am__append_8) \
 	$(am__append_13) $(am__append_16)
 libgettextlib_la_DEPENDENCIES = $(gl_LTLIBOBJS) $(am__append_9) \
 	$(am__append_14) $(am__append_17)
 EXTRA_libgettextlib_la_SOURCES = acl_entries.c atexit.c \
-	canonicalize-lgpl.c close.c closedir.c classpath.c dup2.c \
-	error.c fcntl.c fd-ostream.oo.c file-ostream.oo.c float.c \
-	itold.c fnmatch.c fnmatch_loop.c fopen.c fstat.c getdelim.c \
-	getdtablesize.c getline.c getopt.c getopt1.c gettimeofday.c \
-	html-ostream.oo.c html-styled-ostream.oo.c iconv.c \
-	iconv_close.c iconv_open.c isinf.c isnan.c isnand.c isnan.c \
-	isnand.c isnan.c isnanf.c isnan.c isnanf.c isnan.c isnanl.c \
-	isnan.c isnanl.c iswblank.c libcroco/cr-additional-sel.c \
-	libcroco/cr-attr-sel.c libcroco/cr-cascade.c \
-	libcroco/cr-declaration.c libcroco/cr-doc-handler.c \
-	libcroco/cr-enc-handler.c libcroco/cr-fonts.c \
-	libcroco/cr-input.c libcroco/cr-num.c libcroco/cr-om-parser.c \
-	libcroco/cr-parser.c libcroco/cr-parsing-location.c \
-	libcroco/cr-prop-list.c libcroco/cr-pseudo.c libcroco/cr-rgb.c \
-	libcroco/cr-sel-eng.c libcroco/cr-selector.c \
-	libcroco/cr-simple-sel.c libcroco/cr-statement.c \
-	libcroco/cr-string.c libcroco/cr-style.c \
-	libcroco/cr-stylesheet.c libcroco/cr-term.c \
-	libcroco/cr-tknzr.c libcroco/cr-token.c libcroco/cr-utils.c \
-	glib/ghash.c glib/glist.c glib/gmessages.c glib/gprimes.c \
-	glib/gstrfuncs.c glib/gstring.c libxml/DOCBparser.c \
-	libxml/HTMLparser.c libxml/HTMLtree.c libxml/SAX.c \
-	libxml/SAX2.c libxml/buf.c libxml/c14n.c libxml/catalog.c \
-	libxml/chvalid.c libxml/debugXML.c libxml/dict.c \
-	libxml/encoding.c libxml/entities.c libxml/error.c \
-	libxml/globals.c libxml/hash.c libxml/legacy.c libxml/list.c \
-	libxml/nanoftp.c libxml/nanohttp.c libxml/parser.c \
-	libxml/parserInternals.c libxml/pattern.c libxml/relaxng.c \
-	libxml/schematron.c libxml/threads.c libxml/tree.c \
-	libxml/trionan.c libxml/uri.c libxml/valid.c libxml/xinclude.c \
-	libxml/xlink.c libxml/xmlIO.c libxml/xmlmemory.c \
-	libxml/xmlmodule.c libxml/xmlreader.c libxml/xmlregexp.c \
-	libxml/xmlsave.c libxml/xmlschemas.c libxml/xmlschemastypes.c \
-	libxml/xmlstring.c libxml/xmlunicode.c libxml/xmlwriter.c \
-	libxml/xpath.c libxml/xpointer.c log10.c lstat.c malloc.c \
-	mbrtowc.c mbsinit.c mbsrtowcs-state.c mbsrtowcs.c memchr.c \
-	memmove.c memset.c mkdtemp.c msvc-inval.c msvc-nothrow.c \
-	obstack.c open.c opendir.c ostream.oo.c spawni.c \
-	spawn_faction_addclose.c spawn_faction_adddup2.c \
-	spawn_faction_addopen.c spawn_faction_destroy.c \
-	spawn_faction_init.c spawnattr_destroy.c spawnattr_init.c \
-	spawnattr_setflags.c spawnattr_setsigmask.c spawnp.c raise.c \
-	rawmemchr.c read.c readdir.c readlink.c realloc.c progreloc.c \
-	relocatable.c rmdir.c safe-read.c secure_getenv.c setenv.c \
-	setlocale.c sigaction.c signbitd.c signbitf.c signbitl.c \
-	stdio-write.c sigprocmask.c snprintf.c stat.c stpcpy.c \
-	stpncpy.c strchrnul.c strcspn.c strerror.c strerror-override.c \
-	strnlen.c strpbrk.c strstr.c strtol.c strtol.c strtoul.c \
-	styled-ostream.oo.c term-ostream.oo.c term-styled-ostream.oo.c \
-	tparm.c tputs.c unsetenv.c asnprintf.c printf-args.c \
-	printf-parse.c vasnprintf.c asprintf.c vasprintf.c vsnprintf.c \
-	waitpid.c wcwidth.c write.c
+	canonicalize-lgpl.c close.c closedir.c classpath.c dirfd.c \
+	dup2.c error.c fcntl.c fd-ostream.oo.c file-ostream.oo.c \
+	float.c itold.c fnmatch.c fnmatch_loop.c fopen.c fstat.c \
+	getdelim.c getdtablesize.c getline.c getopt.c getopt1.c \
+	gettimeofday.c html-ostream.oo.c html-styled-ostream.oo.c \
+	iconv.c iconv_close.c iconv_open.c isinf.c isnan.c isnand.c \
+	isnan.c isnand.c isnan.c isnanf.c isnan.c isnanf.c isnan.c \
+	isnanl.c isnan.c isnanl.c iswblank.c \
+	libcroco/cr-additional-sel.c libcroco/cr-attr-sel.c \
+	libcroco/cr-cascade.c libcroco/cr-declaration.c \
+	libcroco/cr-doc-handler.c libcroco/cr-enc-handler.c \
+	libcroco/cr-fonts.c libcroco/cr-input.c libcroco/cr-num.c \
+	libcroco/cr-om-parser.c libcroco/cr-parser.c \
+	libcroco/cr-parsing-location.c libcroco/cr-prop-list.c \
+	libcroco/cr-pseudo.c libcroco/cr-rgb.c libcroco/cr-sel-eng.c \
+	libcroco/cr-selector.c libcroco/cr-simple-sel.c \
+	libcroco/cr-statement.c libcroco/cr-string.c \
+	libcroco/cr-style.c libcroco/cr-stylesheet.c \
+	libcroco/cr-term.c libcroco/cr-tknzr.c libcroco/cr-token.c \
+	libcroco/cr-utils.c glib/ghash.c glib/glist.c glib/gmessages.c \
+	glib/gprimes.c glib/gstrfuncs.c glib/gstring.c \
+	libxml/DOCBparser.c libxml/HTMLparser.c libxml/HTMLtree.c \
+	libxml/SAX.c libxml/SAX2.c libxml/buf.c libxml/c14n.c \
+	libxml/catalog.c libxml/chvalid.c libxml/debugXML.c \
+	libxml/dict.c libxml/encoding.c libxml/entities.c \
+	libxml/error.c libxml/globals.c libxml/hash.c libxml/legacy.c \
+	libxml/list.c libxml/nanoftp.c libxml/nanohttp.c \
+	libxml/parser.c libxml/parserInternals.c libxml/pattern.c \
+	libxml/relaxng.c libxml/schematron.c libxml/threads.c \
+	libxml/tree.c libxml/trionan.c libxml/uri.c libxml/valid.c \
+	libxml/xinclude.c libxml/xlink.c libxml/xmlIO.c \
+	libxml/xmlmemory.c libxml/xmlmodule.c libxml/xmlreader.c \
+	libxml/xmlregexp.c libxml/xmlsave.c libxml/xmlschemas.c \
+	libxml/xmlschemastypes.c libxml/xmlstring.c \
+	libxml/xmlunicode.c libxml/xmlwriter.c libxml/xpath.c \
+	libxml/xpointer.c log10.c lstat.c malloc.c mbrtowc.c mbsinit.c \
+	mbsrtowcs-state.c mbsrtowcs.c memchr.c memmove.c memset.c \
+	mkdtemp.c msvc-inval.c msvc-nothrow.c obstack.c open.c \
+	opendir.c ostream.oo.c spawni.c spawn_faction_addclose.c \
+	spawn_faction_adddup2.c spawn_faction_addopen.c \
+	spawn_faction_destroy.c spawn_faction_init.c \
+	spawnattr_destroy.c spawnattr_init.c spawnattr_setflags.c \
+	spawnattr_setsigmask.c spawnp.c raise.c rawmemchr.c read.c \
+	readdir.c readlink.c realloc.c progreloc.c relocatable.c \
+	rmdir.c safe-read.c secure_getenv.c setenv.c setlocale.c \
+	sigaction.c signbitd.c signbitf.c signbitl.c stdio-write.c \
+	sigprocmask.c snprintf.c stat.c stpcpy.c stpncpy.c strchrnul.c \
+	strcspn.c strerror.c strerror-override.c strnlen.c strpbrk.c \
+	strstr.c strtol.c strtol.c strtoul.c styled-ostream.oo.c \
+	term-ostream.oo.c term-styled-ostream.oo.c tparm.c tputs.c \
+	unsetenv.c asnprintf.c printf-args.c printf-parse.c \
+	vasnprintf.c asprintf.c vasprintf.c vsnprintf.c waitpid.c \
+	wcwidth.c write.c xmemdup0.c
 
 # Need $(LTLIBUNISTRING) because ulc_width_linebreaks, uc_width, etc. may be
 # taken from libunistring, when the configure option --with-libunistring-prefix
@@ -2474,7 +2483,7 @@ libgettextlib_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(FABS_LIBM) \
 	$(LOG10_LIBM) $(LTLIBICONV) $(LTLIBINTL) $(LTLIBTHREAD) \
 	$(LTLIBUNISTRING) $(OPENMP_CFLAGS) $(POW_LIBM) \
 	@INTL_MACOSX_LIBS@ -release @VERSION@ $(am__append_3) \
-	$(am__append_12)
+	$(am__append_12) $(am__append_36)
 
 # Use this preprocessor expression to decide whether #include_next works.
 # Do not rely on a 'configure'-time test for this, since the expression
diff --git a/gettext-tools/gnulib-lib/acl-errno-valid.c b/gettext-tools/gnulib-lib/acl-errno-valid.c
index a64d3d3..086f75f 100644
--- a/gettext-tools/gnulib-lib/acl-errno-valid.c
+++ b/gettext-tools/gnulib-lib/acl-errno-valid.c
@@ -1,6 +1,6 @@
 /* Test whether ACLs are well supported on this system.
 
-   Copyright 2013-2015 Free Software Foundation, Inc.
+   Copyright 2013-2016 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
diff --git a/gettext-tools/gnulib-lib/acl-internal.c b/gettext-tools/gnulib-lib/acl-internal.c
index c1b7017..4de60c3 100644
--- a/gettext-tools/gnulib-lib/acl-internal.c
+++ b/gettext-tools/gnulib-lib/acl-internal.c
@@ -1,6 +1,6 @@
 /* Test whether a file has a nontrivial ACL.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
@@ -478,7 +478,7 @@ acl_nontrivial (int count, struct acl *entries)
 void
 free_permission_context (struct permission_context *ctx)
 {
-#ifdef USE_ACL
+#if USE_ACL
 # if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
   if (ctx->acl)
     acl_free (ctx->acl);
diff --git a/gettext-tools/gnulib-lib/acl-internal.h b/gettext-tools/gnulib-lib/acl-internal.h
index 560d146..636273e 100644
--- a/gettext-tools/gnulib-lib/acl-internal.h
+++ b/gettext-tools/gnulib-lib/acl-internal.h
@@ -1,6 +1,6 @@
 /* Internal implementation of access control lists.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
@@ -255,7 +255,7 @@ extern int acl_nontrivial (int count, struct acl *entries);
 
 struct permission_context {
   mode_t mode;
-#ifdef USE_ACL
+#if USE_ACL
 # if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
   acl_t acl;
 #  if !HAVE_ACL_TYPE_EXTENDED
diff --git a/gettext-tools/gnulib-lib/acl.h b/gettext-tools/gnulib-lib/acl.h
index 88ea08d..491b1ba 100644
--- a/gettext-tools/gnulib-lib/acl.h
+++ b/gettext-tools/gnulib-lib/acl.h
@@ -1,6 +1,6 @@
 /* acl.c - access control lists
 
-   Copyright (C) 2002, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/acl_entries.c b/gettext-tools/gnulib-lib/acl_entries.c
index 936a131..9fc9cf5 100644
--- a/gettext-tools/gnulib-lib/acl_entries.c
+++ b/gettext-tools/gnulib-lib/acl_entries.c
@@ -1,6 +1,6 @@
 /* Return the number of entries in an ACL.
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/addext.c b/gettext-tools/gnulib-lib/addext.c
index bea586f..9cc64c0 100644
--- a/gettext-tools/gnulib-lib/addext.c
+++ b/gettext-tools/gnulib-lib/addext.c
@@ -1,6 +1,6 @@
 /* addext.c -- add an extension to a file name
-   Copyright (C) 1990, 1997-1999, 2001-2003, 2005-2006, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990, 1997-1999, 2001-2003, 2005-2006, 2015-2016 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
diff --git a/gettext-tools/gnulib-lib/alignof.h b/gettext-tools/gnulib-lib/alignof.h
index be53fa5..9b51af0 100644
--- a/gettext-tools/gnulib-lib/alignof.h
+++ b/gettext-tools/gnulib-lib/alignof.h
@@ -1,5 +1,5 @@
 /* Determine alignment of types.
-   Copyright (C) 2003-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/alloca.in.h b/gettext-tools/gnulib-lib/alloca.in.h
index b334262..8603e79 100644
--- a/gettext-tools/gnulib-lib/alloca.in.h
+++ b/gettext-tools/gnulib-lib/alloca.in.h
@@ -1,5 +1,5 @@
 /* Memory allocation on the stack.
-   Copyright (C) 1995, 1999, 2001-2007, 2015 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2007, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/allocator.h b/gettext-tools/gnulib-lib/allocator.h
index c7c851f..1f1eab6 100644
--- a/gettext-tools/gnulib-lib/allocator.h
+++ b/gettext-tools/gnulib-lib/allocator.h
@@ -1,6 +1,6 @@
 /* Memory allocators such as malloc+free.
 
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/areadlink.c b/gettext-tools/gnulib-lib/areadlink.c
index 248cc6b..fee84a3 100644
--- a/gettext-tools/gnulib-lib/areadlink.c
+++ b/gettext-tools/gnulib-lib/areadlink.c
@@ -1,7 +1,7 @@
 /* areadlink.c -- readlink wrapper to return the link name in malloc'd storage
    Unlike xreadlink and xreadlink_with_size, don't ever call exit.
 
-   Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/areadlink.h b/gettext-tools/gnulib-lib/areadlink.h
index d9e0fa1..829c959 100644
--- a/gettext-tools/gnulib-lib/areadlink.h
+++ b/gettext-tools/gnulib-lib/areadlink.h
@@ -1,6 +1,6 @@
 /* Read symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/argmatch.c b/gettext-tools/gnulib-lib/argmatch.c
index 0e452bd..bd1ad71 100644
--- a/gettext-tools/gnulib-lib/argmatch.c
+++ b/gettext-tools/gnulib-lib/argmatch.c
@@ -1,6 +1,6 @@
 /* argmatch.c -- find a match for a string in an array
 
-   Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2015 Free Software
+   Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/argmatch.h b/gettext-tools/gnulib-lib/argmatch.h
index 1543c52..681e529 100644
--- a/gettext-tools/gnulib-lib/argmatch.h
+++ b/gettext-tools/gnulib-lib/argmatch.h
@@ -1,6 +1,6 @@
 /* argmatch.h -- definitions and prototypes for argmatch.c
 
-   Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2015 Free Software
+   Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/asnprintf.c b/gettext-tools/gnulib-lib/asnprintf.c
index d6776ca..f23b776 100644
--- a/gettext-tools/gnulib-lib/asnprintf.c
+++ b/gettext-tools/gnulib-lib/asnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/asprintf.c b/gettext-tools/gnulib-lib/asprintf.c
index 06ae3dd..d0ca5f2 100644
--- a/gettext-tools/gnulib-lib/asprintf.c
+++ b/gettext-tools/gnulib-lib/asprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/backupfile.c b/gettext-tools/gnulib-lib/backupfile.c
index 5ec0228..7d9313f 100644
--- a/gettext-tools/gnulib-lib/backupfile.c
+++ b/gettext-tools/gnulib-lib/backupfile.c
@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990-2003, 2005-2006, 2012, 2015 Free Software
+   Copyright (C) 1990-2003, 2005-2006, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/backupfile.h b/gettext-tools/gnulib-lib/backupfile.h
index 91c37fa..279c2fb 100644
--- a/gettext-tools/gnulib-lib/backupfile.h
+++ b/gettext-tools/gnulib-lib/backupfile.h
@@ -1,5 +1,5 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
-   Copyright (C) 1990-1992, 1997-1999, 2001-2003, 2015 Free Software
+   Copyright (C) 1990-1992, 1997-1999, 2001-2003, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/basename.c b/gettext-tools/gnulib-lib/basename.c
index 56421aa..3518ade 100644
--- a/gettext-tools/gnulib-lib/basename.c
+++ b/gettext-tools/gnulib-lib/basename.c
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015 Free Software
+   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-tools/gnulib-lib/basename.h b/gettext-tools/gnulib-lib/basename.h
index 489cc67..2d7f0ad 100644
--- a/gettext-tools/gnulib-lib/basename.h
+++ b/gettext-tools/gnulib-lib/basename.h
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001-2003, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/binary-io.h b/gettext-tools/gnulib-lib/binary-io.h
index f5b66c7..9f17c0d 100644
--- a/gettext-tools/gnulib-lib/binary-io.h
+++ b/gettext-tools/gnulib-lib/binary-io.h
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003, 2005, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2008-2016 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
@@ -60,7 +60,7 @@ set_binary_mode (int fd, int mode)
 
 /* SET_BINARY (fd);
    changes the file descriptor fd to perform binary I/O.  */
-#ifdef __DJGPP__
+#if defined __DJGPP__ || defined __EMX__
 # include <unistd.h> /* declares isatty() */
   /* Avoid putting stdin/stdout in binary mode if it is connected to
      the console, because that would make it impossible for the user
diff --git a/gettext-tools/gnulib-lib/byteswap.in.h b/gettext-tools/gnulib-lib/byteswap.in.h
index db885d8..d965962 100644
--- a/gettext-tools/gnulib-lib/byteswap.in.h
+++ b/gettext-tools/gnulib-lib/byteswap.in.h
@@ -1,5 +1,5 @@
 /* byteswap.h - Byte swapping
-   Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc.
    Written by Oskar Liljeblad <oskar@osk.mine.nu>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/c-ctype.h b/gettext-tools/gnulib-lib/c-ctype.h
index 1512530..717ae78 100644
--- a/gettext-tools/gnulib-lib/c-ctype.h
+++ b/gettext-tools/gnulib-lib/c-ctype.h
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/c-strcase.h b/gettext-tools/gnulib-lib/c-strcase.h
index f25bcca..7e570f5 100644
--- a/gettext-tools/gnulib-lib/c-strcase.h
+++ b/gettext-tools/gnulib-lib/c-strcase.h
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2015 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/c-strcasecmp.c b/gettext-tools/gnulib-lib/c-strcasecmp.c
index 6deb6d1..bd113b7 100644
--- a/gettext-tools/gnulib-lib/c-strcasecmp.c
+++ b/gettext-tools/gnulib-lib/c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/c-strcaseeq.h b/gettext-tools/gnulib-lib/c-strcaseeq.h
index 28dc55e..ed57251 100644
--- a/gettext-tools/gnulib-lib/c-strcaseeq.h
+++ b/gettext-tools/gnulib-lib/c-strcaseeq.h
@@ -1,5 +1,5 @@
 /* Optimized case-insensitive string comparison in C locale.
-   Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/c-strcasestr.c b/gettext-tools/gnulib-lib/c-strcasestr.c
index cffece8..e459b5f 100644
--- a/gettext-tools/gnulib-lib/c-strcasestr.c
+++ b/gettext-tools/gnulib-lib/c-strcasestr.c
@@ -1,5 +1,5 @@
 /* c-strcasestr.c -- case insensitive substring search in C locale
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/c-strcasestr.h b/gettext-tools/gnulib-lib/c-strcasestr.h
index 3084cd6..271f033 100644
--- a/gettext-tools/gnulib-lib/c-strcasestr.h
+++ b/gettext-tools/gnulib-lib/c-strcasestr.h
@@ -1,5 +1,5 @@
 /* Case-insensitive searching in a string in C locale.
-   Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/c-strncasecmp.c b/gettext-tools/gnulib-lib/c-strncasecmp.c
index b98e368..c316929 100644
--- a/gettext-tools/gnulib-lib/c-strncasecmp.c
+++ b/gettext-tools/gnulib-lib/c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/c-strstr.c b/gettext-tools/gnulib-lib/c-strstr.c
index c8bebe6..eda7610 100644
--- a/gettext-tools/gnulib-lib/c-strstr.c
+++ b/gettext-tools/gnulib-lib/c-strstr.c
@@ -1,5 +1,5 @@
 /* c-strstr.c -- substring search in C locale
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/c-strstr.h b/gettext-tools/gnulib-lib/c-strstr.h
index 4d44197..fec74a7 100644
--- a/gettext-tools/gnulib-lib/c-strstr.h
+++ b/gettext-tools/gnulib-lib/c-strstr.h
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2001-2003, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/canonicalize-lgpl.c b/gettext-tools/gnulib-lib/canonicalize-lgpl.c
index 1c9f2ee..1d0bf65 100644
--- a/gettext-tools/gnulib-lib/canonicalize-lgpl.c
+++ b/gettext-tools/gnulib-lib/canonicalize-lgpl.c
@@ -1,5 +1,5 @@
 /* Return the canonical absolute name of a given file.
-   Copyright (C) 1996-2015 Free Software Foundation, Inc.
+   Copyright (C) 1996-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/careadlinkat.c b/gettext-tools/gnulib-lib/careadlinkat.c
index f2f5da2..4180de9 100644
--- a/gettext-tools/gnulib-lib/careadlinkat.c
+++ b/gettext-tools/gnulib-lib/careadlinkat.c
@@ -1,6 +1,6 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/careadlinkat.h b/gettext-tools/gnulib-lib/careadlinkat.h
index 4eb9fcc..84ede3e 100644
--- a/gettext-tools/gnulib-lib/careadlinkat.h
+++ b/gettext-tools/gnulib-lib/careadlinkat.h
@@ -1,6 +1,6 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/classpath.c b/gettext-tools/gnulib-lib/classpath.c
index 2a57de2..fa58684 100644
--- a/gettext-tools/gnulib-lib/classpath.c
+++ b/gettext-tools/gnulib-lib/classpath.c
@@ -1,5 +1,5 @@
 /* Java CLASSPATH handling.
-   Copyright (C) 2001-2003, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/classpath.h b/gettext-tools/gnulib-lib/classpath.h
index f34cdc7..0ed774d 100644
--- a/gettext-tools/gnulib-lib/classpath.h
+++ b/gettext-tools/gnulib-lib/classpath.h
@@ -1,5 +1,5 @@
 /* Java CLASSPATH handling.
-   Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/clean-temp.c b/gettext-tools/gnulib-lib/clean-temp.c
index d388464..9e0fb27 100644
--- a/gettext-tools/gnulib-lib/clean-temp.c
+++ b/gettext-tools/gnulib-lib/clean-temp.c
@@ -1,5 +1,5 @@
 /* Temporary directories and temporary files with automatic cleanup.
-   Copyright (C) 2001, 2003, 2006-2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001, 2003, 2006-2007, 2009-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
@@ -584,7 +584,7 @@ supports_delete_on_close ()
 
       /* According to
          <http://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx>
-         this structure must be initialised as follows:  */
+         this structure must be initialized as follows:  */
       v.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
 
       if (GetVersionEx (&v))
diff --git a/gettext-tools/gnulib-lib/clean-temp.h b/gettext-tools/gnulib-lib/clean-temp.h
index b730cd7..335e504 100644
--- a/gettext-tools/gnulib-lib/clean-temp.h
+++ b/gettext-tools/gnulib-lib/clean-temp.h
@@ -1,5 +1,5 @@
 /* Temporary directories and temporary files with automatic cleanup.
-   Copyright (C) 2006, 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/cloexec.c b/gettext-tools/gnulib-lib/cloexec.c
index 29d1a38..1202836 100644
--- a/gettext-tools/gnulib-lib/cloexec.c
+++ b/gettext-tools/gnulib-lib/cloexec.c
@@ -1,6 +1,6 @@
 /* closexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 1991, 2004-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2004-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/cloexec.h b/gettext-tools/gnulib-lib/cloexec.h
index ef5bacc..0e58437 100644
--- a/gettext-tools/gnulib-lib/cloexec.h
+++ b/gettext-tools/gnulib-lib/cloexec.h
@@ -1,6 +1,6 @@
 /* closexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 2004, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/close.c b/gettext-tools/gnulib-lib/close.c
index 54d1f71..46a7aa5 100644
--- a/gettext-tools/gnulib-lib/close.c
+++ b/gettext-tools/gnulib-lib/close.c
@@ -1,5 +1,5 @@
 /* close replacement.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/closedir.c b/gettext-tools/gnulib-lib/closedir.c
index f80843f..30d1290 100644
--- a/gettext-tools/gnulib-lib/closedir.c
+++ b/gettext-tools/gnulib-lib/closedir.c
@@ -1,5 +1,5 @@
 /* Stop reading the entries of a directory.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
@@ -39,7 +39,7 @@
 int
 closedir (DIR *dirp)
 {
-# if REPLACE_FCHDIR
+# if REPLACE_FCHDIR || REPLACE_DIRFD
   int fd = dirfd (dirp);
 # endif
   int retval;
@@ -49,6 +49,10 @@ closedir (DIR *dirp)
 
   retval = closedir (dirp);
 
+# ifdef __KLIBC__
+  if (!retval)
+    _gl_unregister_dirp_fd (fd);
+# endif
 #else
 
   if (dirp->current != INVALID_HANDLE_VALUE)
diff --git a/gettext-tools/gnulib-lib/closeout.c b/gettext-tools/gnulib-lib/closeout.c
index a790176..8bba65b 100644
--- a/gettext-tools/gnulib-lib/closeout.c
+++ b/gettext-tools/gnulib-lib/closeout.c
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output and standard error
-   Copyright (C) 1998-2007, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2007, 2012, 2015-2016 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
diff --git a/gettext-tools/gnulib-lib/closeout.h b/gettext-tools/gnulib-lib/closeout.h
index 896e22f..284d1e7 100644
--- a/gettext-tools/gnulib-lib/closeout.h
+++ b/gettext-tools/gnulib-lib/closeout.h
@@ -1,5 +1,5 @@
 /* Close standard output and standard error.
-   Copyright (C) 1998-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2003, 2006, 2015-2016 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
diff --git a/gettext-tools/gnulib-lib/concat-filename.c b/gettext-tools/gnulib-lib/concat-filename.c
index 1c4e77a..8fff22d 100644
--- a/gettext-tools/gnulib-lib/concat-filename.c
+++ b/gettext-tools/gnulib-lib/concat-filename.c
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2016 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 the
diff --git a/gettext-tools/gnulib-lib/concat-filename.h b/gettext-tools/gnulib-lib/concat-filename.h
index e308744..08f6b40 100644
--- a/gettext-tools/gnulib-lib/concat-filename.h
+++ b/gettext-tools/gnulib-lib/concat-filename.h
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/config.charset b/gettext-tools/gnulib-lib/config.charset
index f06d7e9..947d916 100644
--- a/gettext-tools/gnulib-lib/config.charset
+++ b/gettext-tools/gnulib-lib/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2016 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
diff --git a/gettext-tools/gnulib-lib/copy-acl.c b/gettext-tools/gnulib-lib/copy-acl.c
index 2be8c9e..4b6b443 100644
--- a/gettext-tools/gnulib-lib/copy-acl.c
+++ b/gettext-tools/gnulib-lib/copy-acl.c
@@ -1,6 +1,6 @@
 /* Copy access control list from one file to file.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/copy-file.c b/gettext-tools/gnulib-lib/copy-file.c
index 90e377c..a3b7270 100644
--- a/gettext-tools/gnulib-lib/copy-file.c
+++ b/gettext-tools/gnulib-lib/copy-file.c
@@ -1,5 +1,5 @@
 /* Copying of files.
-   Copyright (C) 2001-2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/copy-file.h b/gettext-tools/gnulib-lib/copy-file.h
index cdc55e5..f31e242 100644
--- a/gettext-tools/gnulib-lib/copy-file.h
+++ b/gettext-tools/gnulib-lib/copy-file.h
@@ -1,5 +1,5 @@
 /* Copying of files.
-   Copyright (C) 2001-2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/csharpcomp.c b/gettext-tools/gnulib-lib/csharpcomp.c
index 4628571..5b5a59d 100644
--- a/gettext-tools/gnulib-lib/csharpcomp.c
+++ b/gettext-tools/gnulib-lib/csharpcomp.c
@@ -1,5 +1,5 @@
 /* Compile a C# program.
-   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/csharpcomp.h b/gettext-tools/gnulib-lib/csharpcomp.h
index 5bb2d2b..f747514 100644
--- a/gettext-tools/gnulib-lib/csharpcomp.h
+++ b/gettext-tools/gnulib-lib/csharpcomp.h
@@ -1,5 +1,5 @@
 /* Compile a C# program.
-   Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/csharpexec.c b/gettext-tools/gnulib-lib/csharpexec.c
index a414d6c..1d8d0cc 100644
--- a/gettext-tools/gnulib-lib/csharpexec.c
+++ b/gettext-tools/gnulib-lib/csharpexec.c
@@ -1,5 +1,5 @@
 /* Execute a C# program.
-   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/csharpexec.h b/gettext-tools/gnulib-lib/csharpexec.h
index cc62cdc..f50948c 100644
--- a/gettext-tools/gnulib-lib/csharpexec.h
+++ b/gettext-tools/gnulib-lib/csharpexec.h
@@ -1,5 +1,5 @@
 /* Execute a C# program.
-   Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/diffseq.h b/gettext-tools/gnulib-lib/diffseq.h
index 2a02651..35bcd56 100644
--- a/gettext-tools/gnulib-lib/diffseq.h
+++ b/gettext-tools/gnulib-lib/diffseq.h
@@ -1,6 +1,6 @@
 /* Analyze differences between two vectors.
 
-   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2015 Free Software
+   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/dirent-private.h b/gettext-tools/gnulib-lib/dirent-private.h
index aa01f60..9b200f3 100644
--- a/gettext-tools/gnulib-lib/dirent-private.h
+++ b/gettext-tools/gnulib-lib/dirent-private.h
@@ -1,5 +1,5 @@
 /* Private details of the DIR type.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/dirent.in.h b/gettext-tools/gnulib-lib/dirent.in.h
index 154d268..65482d7 100644
--- a/gettext-tools/gnulib-lib/dirent.in.h
+++ b/gettext-tools/gnulib-lib/dirent.in.h
@@ -1,5 +1,5 @@
 /* A GNU-like <dirent.h>.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
@@ -158,6 +158,13 @@ _GL_WARN_ON_USE (closedir, "closedir is not portable - "
 #  endif
 _GL_FUNCDECL_RPL (dirfd, int, (DIR *) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (dirfd, int, (DIR *));
+
+#  ifdef __KLIBC__
+/* Gnulib internal hooks needed to maintain the dirfd metadata.  */
+_GL_EXTERN_C int _gl_register_dirp_fd (int fd, DIR *dirp)
+     _GL_ARG_NONNULL ((2));
+_GL_EXTERN_C void _gl_unregister_dirp_fd (int fd);
+#  endif
 # else
 #  if defined __cplusplus && defined GNULIB_NAMESPACE && defined dirfd
     /* dirfd is defined as a macro and not as a function.
diff --git a/gettext-tools/gnulib-lib/dirfd.c b/gettext-tools/gnulib-lib/dirfd.c
new file mode 100644
index 0000000..a325848
--- /dev/null
+++ b/gettext-tools/gnulib-lib/dirfd.c
@@ -0,0 +1,98 @@
+/* dirfd.c -- return the file descriptor associated with an open DIR*
+
+   Copyright (C) 2001, 2006, 2008-2016 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Jim Meyering. */
+
+#include <config.h>
+
+#include <dirent.h>
+#include <errno.h>
+
+#ifdef __KLIBC__
+# include <stdlib.h>
+# include <io.h>
+
+static struct dirp_fd_list
+{
+  DIR *dirp;
+  int fd;
+  struct dirp_fd_list *next;
+} *dirp_fd_start = NULL;
+
+/* Register fd associated with dirp to dirp_fd_list. */
+int
+_gl_register_dirp_fd (int fd, DIR *dirp)
+{
+  struct dirp_fd_list *new_dirp_fd = malloc (sizeof *new_dirp_fd);
+  if (!new_dirp_fd)
+    return -1;
+
+  new_dirp_fd->dirp = dirp;
+  new_dirp_fd->fd = fd;
+  new_dirp_fd->next = dirp_fd_start;
+
+  dirp_fd_start = new_dirp_fd;
+
+  return 0;
+}
+
+/* Unregister fd from dirp_fd_list with closing it */
+void
+_gl_unregister_dirp_fd (int fd)
+{
+  struct dirp_fd_list *dirp_fd;
+  struct dirp_fd_list *dirp_fd_prev;
+
+  for (dirp_fd_prev = NULL, dirp_fd = dirp_fd_start; dirp_fd;
+       dirp_fd_prev = dirp_fd, dirp_fd = dirp_fd->next)
+    {
+      if (dirp_fd->fd == fd)
+        {
+          if (dirp_fd_prev)
+            dirp_fd_prev->next = dirp_fd->next;
+          else  /* dirp_fd == dirp_fd_start */
+            dirp_fd_start = dirp_fd_start->next;
+
+          close (fd);
+          free (dirp_fd);
+          break;
+        }
+    }
+}
+#endif
+
+int
+dirfd (DIR *dir_p)
+{
+  int fd = DIR_TO_FD (dir_p);
+  if (fd == -1)
+#ifndef __KLIBC__
+    errno = ENOTSUP;
+#else
+    {
+      struct dirp_fd_list *dirp_fd;
+
+      for (dirp_fd = dirp_fd_start; dirp_fd; dirp_fd = dirp_fd->next)
+        if (dirp_fd->dirp == dir_p)
+          return dirp_fd->fd;
+
+      errno = EINVAL;
+    }
+#endif
+
+  return fd;
+}
diff --git a/gettext-tools/gnulib-lib/dosname.h b/gettext-tools/gnulib-lib/dosname.h
index 893baf6..83a953f 100644
--- a/gettext-tools/gnulib-lib/dosname.h
+++ b/gettext-tools/gnulib-lib/dosname.h
@@ -1,6 +1,6 @@
 /* File names on MS-DOS/Windows systems.
 
-   Copyright (C) 2000-2001, 2004-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2004-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/dup-safer-flag.c b/gettext-tools/gnulib-lib/dup-safer-flag.c
index f4610ee..f5b81b7 100644
--- a/gettext-tools/gnulib-lib/dup-safer-flag.c
+++ b/gettext-tools/gnulib-lib/dup-safer-flag.c
@@ -1,7 +1,7 @@
 /* Duplicate a file descriptor result, avoiding clobbering
    STD{IN,OUT,ERR}_FILENO, with specific flags.
 
-   Copyright (C) 2001, 2004-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/dup-safer.c b/gettext-tools/gnulib-lib/dup-safer.c
index c6436cd..6ed8f79 100644
--- a/gettext-tools/gnulib-lib/dup-safer.c
+++ b/gettext-tools/gnulib-lib/dup-safer.c
@@ -1,6 +1,6 @@
 /* Invoke dup, but avoid some glitches.
 
-   Copyright (C) 2001, 2004-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/dup2.c b/gettext-tools/gnulib-lib/dup2.c
index 0e13214..5d026f2 100644
--- a/gettext-tools/gnulib-lib/dup2.c
+++ b/gettext-tools/gnulib-lib/dup2.c
@@ -1,6 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
 
-   Copyright (C) 1999, 2004-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2016 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
@@ -85,6 +85,57 @@ ms_windows_dup2 (int fd, int desired_fd)
 
 #  define dup2 ms_windows_dup2
 
+# elif defined __KLIBC__
+
+#  include <InnoTekLIBC/backend.h>
+
+static int
+klibc_dup2dirfd (int fd, int desired_fd)
+{
+  int tempfd;
+  int dupfd;
+
+  tempfd = open ("NUL", O_RDONLY);
+  if (tempfd == -1)
+    return -1;
+
+  if (tempfd == desired_fd)
+    {
+      close (tempfd);
+
+      char path[_MAX_PATH];
+      if (__libc_Back_ioFHToPath (fd, path, sizeof (path)))
+        return -1;
+
+      return open(path, O_RDONLY);
+    }
+
+  dupfd = klibc_dup2dirfd (fd, desired_fd);
+
+  close (tempfd);
+
+  return dupfd;
+}
+
+static int
+klibc_dup2 (int fd, int desired_fd)
+{
+  int dupfd;
+  struct stat sbuf;
+
+  dupfd = dup2 (fd, desired_fd);
+  if (dupfd == -1 && errno == ENOTSUP \
+      && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode))
+    {
+      close (desired_fd);
+
+      return klibc_dup2dirfd (fd, desired_fd);
+    }
+
+  return dupfd;
+}
+
+#  define dup2 klibc_dup2
 # endif
 
 int
diff --git a/gettext-tools/gnulib-lib/errno.in.h b/gettext-tools/gnulib-lib/errno.in.h
index affbb97..b8397ee 100644
--- a/gettext-tools/gnulib-lib/errno.in.h
+++ b/gettext-tools/gnulib-lib/errno.in.h
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/error-progname.c b/gettext-tools/gnulib-lib/error-progname.c
index 525d11f..ba2702a 100644
--- a/gettext-tools/gnulib-lib/error-progname.c
+++ b/gettext-tools/gnulib-lib/error-progname.c
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/error-progname.h b/gettext-tools/gnulib-lib/error-progname.h
index f16107a..5b89b71 100644
--- a/gettext-tools/gnulib-lib/error-progname.h
+++ b/gettext-tools/gnulib-lib/error-progname.h
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/error.c b/gettext-tools/gnulib-lib/error.c
index 0ac7695..56ac889 100644
--- a/gettext-tools/gnulib-lib/error.c
+++ b/gettext-tools/gnulib-lib/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/error.h b/gettext-tools/gnulib-lib/error.h
index c5b3736..a9c19cb 100644
--- a/gettext-tools/gnulib-lib/error.h
+++ b/gettext-tools/gnulib-lib/error.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2015 Free Software Foundation,
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2016 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/gnulib-lib/execute.c b/gettext-tools/gnulib-lib/execute.c
index 7553244..ff6f506 100644
--- a/gettext-tools/gnulib-lib/execute.c
+++ b/gettext-tools/gnulib-lib/execute.c
@@ -1,5 +1,5 @@
 /* Creation of autonomous subprocesses.
-   Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/execute.h b/gettext-tools/gnulib-lib/execute.h
index 33f2ec6..224141e 100644
--- a/gettext-tools/gnulib-lib/execute.h
+++ b/gettext-tools/gnulib-lib/execute.h
@@ -1,5 +1,5 @@
 /* Creation of autonomous subprocesses.
-   Copyright (C) 2001-2003, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/exitfail.c b/gettext-tools/gnulib-lib/exitfail.c
index 8035b89..8033c22 100644
--- a/gettext-tools/gnulib-lib/exitfail.c
+++ b/gettext-tools/gnulib-lib/exitfail.c
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/exitfail.h b/gettext-tools/gnulib-lib/exitfail.h
index 5f09786..ef1e488 100644
--- a/gettext-tools/gnulib-lib/exitfail.h
+++ b/gettext-tools/gnulib-lib/exitfail.h
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/fatal-signal.c b/gettext-tools/gnulib-lib/fatal-signal.c
index 5ed9c4b..2126a90 100644
--- a/gettext-tools/gnulib-lib/fatal-signal.c
+++ b/gettext-tools/gnulib-lib/fatal-signal.c
@@ -1,5 +1,5 @@
 /* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/fatal-signal.h b/gettext-tools/gnulib-lib/fatal-signal.h
index 2037cef..01b9ae0 100644
--- a/gettext-tools/gnulib-lib/fatal-signal.h
+++ b/gettext-tools/gnulib-lib/fatal-signal.h
@@ -1,5 +1,5 @@
 /* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/fcntl.c b/gettext-tools/gnulib-lib/fcntl.c
index 23b73e9..fd17e96 100644
--- a/gettext-tools/gnulib-lib/fcntl.c
+++ b/gettext-tools/gnulib-lib/fcntl.c
@@ -1,6 +1,6 @@
 /* Provide file descriptor control.
 
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
@@ -162,6 +162,93 @@ dupfd (int oldfd, int newfd, int flags)
 }
 #endif /* W32 */
 
+#ifdef __KLIBC__
+
+# define INCL_DOS
+# include <os2.h>
+
+static int
+klibc_fcntl (int fd, int action, /* arg */...)
+{
+  va_list arg_ptr;
+  int arg;
+  struct stat sbuf;
+  int result = -1;
+
+  va_start (arg_ptr, action);
+  arg = va_arg (arg_ptr, int);
+  result = fcntl (fd, action, arg);
+  /* EPERM for F_DUPFD, ENOTSUP for others */
+  if (result == -1 && (errno == EPERM || errno == ENOTSUP)
+      && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode))
+  {
+    ULONG ulMode;
+
+    switch (action)
+      {
+      case F_DUPFD:
+        /* Find available fd */
+        while (fcntl (arg, F_GETFL) != -1 || errno != EBADF)
+          arg++;
+
+        result = dup2 (fd, arg);
+        break;
+
+      /* Using underlying APIs is right ? */
+      case F_GETFD:
+        if (DosQueryFHState (fd, &ulMode))
+          break;
+
+        result = (ulMode & OPEN_FLAGS_NOINHERIT) ? FD_CLOEXEC : 0;
+        break;
+
+      case F_SETFD:
+        if (arg & ~FD_CLOEXEC)
+          break;
+
+        if (DosQueryFHState (fd, &ulMode))
+          break;
+
+        if (arg & FD_CLOEXEC)
+          ulMode |= OPEN_FLAGS_NOINHERIT;
+        else
+          ulMode &= ~OPEN_FLAGS_NOINHERIT;
+
+        /* Filter supported flags.  */
+        ulMode &= (OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR
+                   | OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT);
+
+        if (DosSetFHState (fd, ulMode))
+          break;
+
+        result = 0;
+        break;
+
+      case F_GETFL:
+        result = 0;
+        break;
+
+      case F_SETFL:
+        if (arg != 0)
+          break;
+
+        result = 0;
+        break;
+
+      default :
+        errno = EINVAL;
+        break;
+      }
+  }
+
+  va_end (arg_ptr);
+
+  return result;
+}
+
+# define fcntl klibc_fcntl
+#endif
+
 /* Perform the specified ACTION on the file descriptor FD, possibly
    using the argument ARG further described below.  This replacement
    handles the following actions, and forwards all others on to the
diff --git a/gettext-tools/gnulib-lib/fcntl.in.h b/gettext-tools/gnulib-lib/fcntl.in.h
index e288018..b943973 100644
--- a/gettext-tools/gnulib-lib/fcntl.in.h
+++ b/gettext-tools/gnulib-lib/fcntl.in.h
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-tools/gnulib-lib/fd-hook.c b/gettext-tools/gnulib-lib/fd-hook.c
index b1488c4..8676c6b 100644
--- a/gettext-tools/gnulib-lib/fd-hook.c
+++ b/gettext-tools/gnulib-lib/fd-hook.c
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/fd-hook.h b/gettext-tools/gnulib-lib/fd-hook.h
index bdb9aef..9568d07 100644
--- a/gettext-tools/gnulib-lib/fd-hook.h
+++ b/gettext-tools/gnulib-lib/fd-hook.h
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/fd-ostream.c b/gettext-tools/gnulib-lib/fd-ostream.c
index 7d72ad2..3f2047c 100644
--- a/gettext-tools/gnulib-lib/fd-ostream.c
+++ b/gettext-tools/gnulib-lib/fd-ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "fd-ostream.oo.c"
 /* Output stream referring to a file descriptor.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/fd-ostream.h b/gettext-tools/gnulib-lib/fd-ostream.h
index c60e725..d698430 100644
--- a/gettext-tools/gnulib-lib/fd-ostream.h
+++ b/gettext-tools/gnulib-lib/fd-ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "fd-ostream.oo.h"
 /* Output stream referring to a file descriptor.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/fd-ostream.oo.c b/gettext-tools/gnulib-lib/fd-ostream.oo.c
index 64b9597..b4e1e50 100644
--- a/gettext-tools/gnulib-lib/fd-ostream.oo.c
+++ b/gettext-tools/gnulib-lib/fd-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream referring to a file descriptor.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/fd-ostream.oo.h b/gettext-tools/gnulib-lib/fd-ostream.oo.h
index 155b627..6415401 100644
--- a/gettext-tools/gnulib-lib/fd-ostream.oo.h
+++ b/gettext-tools/gnulib-lib/fd-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream referring to a file descriptor.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/fd-safer-flag.c b/gettext-tools/gnulib-lib/fd-safer-flag.c
index b24861d..4b86583 100644
--- a/gettext-tools/gnulib-lib/fd-safer-flag.c
+++ b/gettext-tools/gnulib-lib/fd-safer-flag.c
@@ -1,7 +1,7 @@
 /* Adjust a file descriptor result so that it avoids clobbering
    STD{IN,OUT,ERR}_FILENO, with specific flags.
 
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/fd-safer.c b/gettext-tools/gnulib-lib/fd-safer.c
index 6c1fb2b..8a6bee2 100644
--- a/gettext-tools/gnulib-lib/fd-safer.c
+++ b/gettext-tools/gnulib-lib/fd-safer.c
@@ -1,6 +1,6 @@
 /* Return a safer copy of a file descriptor.
 
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/file-ostream.c b/gettext-tools/gnulib-lib/file-ostream.c
index b299429..73498cb 100644
--- a/gettext-tools/gnulib-lib/file-ostream.c
+++ b/gettext-tools/gnulib-lib/file-ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "file-ostream.oo.c"
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/file-ostream.h b/gettext-tools/gnulib-lib/file-ostream.h
index f156871..918e8c9 100644
--- a/gettext-tools/gnulib-lib/file-ostream.h
+++ b/gettext-tools/gnulib-lib/file-ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "file-ostream.oo.h"
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/file-ostream.oo.c b/gettext-tools/gnulib-lib/file-ostream.oo.c
index a500825..0b19942 100644
--- a/gettext-tools/gnulib-lib/file-ostream.oo.c
+++ b/gettext-tools/gnulib-lib/file-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/file-ostream.oo.h b/gettext-tools/gnulib-lib/file-ostream.oo.h
index 395cef7..8b4fd8b 100644
--- a/gettext-tools/gnulib-lib/file-ostream.oo.h
+++ b/gettext-tools/gnulib-lib/file-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/filename.h b/gettext-tools/gnulib-lib/filename.h
index 4576993..7d2c31a 100644
--- a/gettext-tools/gnulib-lib/filename.h
+++ b/gettext-tools/gnulib-lib/filename.h
@@ -1,5 +1,5 @@
 /* Basic filename support macros.
-   Copyright (C) 2001-2004, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/findprog.c b/gettext-tools/gnulib-lib/findprog.c
index 731a04e..c97a6e0 100644
--- a/gettext-tools/gnulib-lib/findprog.c
+++ b/gettext-tools/gnulib-lib/findprog.c
@@ -1,5 +1,5 @@
 /* Locating a program in PATH.
-   Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/findprog.h b/gettext-tools/gnulib-lib/findprog.h
index 3bd0653..dc4e18b 100644
--- a/gettext-tools/gnulib-lib/findprog.h
+++ b/gettext-tools/gnulib-lib/findprog.h
@@ -1,5 +1,5 @@
 /* Locating a program in PATH.
-   Copyright (C) 2001-2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/float+.h b/gettext-tools/gnulib-lib/float+.h
index e6aaa92..00fcc76 100644
--- a/gettext-tools/gnulib-lib/float+.h
+++ b/gettext-tools/gnulib-lib/float+.h
@@ -1,5 +1,5 @@
 /* Supplemental information about the floating-point formats.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/float.c b/gettext-tools/gnulib-lib/float.c
index dac9f88..1bad2ee 100644
--- a/gettext-tools/gnulib-lib/float.c
+++ b/gettext-tools/gnulib-lib/float.c
@@ -1,5 +1,5 @@
 /* Auxiliary definitions for <float.h>.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/float.in.h b/gettext-tools/gnulib-lib/float.in.h
index 3bb3826..0b93d90 100644
--- a/gettext-tools/gnulib-lib/float.in.h
+++ b/gettext-tools/gnulib-lib/float.in.h
@@ -1,6 +1,6 @@
 /* A correct <float.h>.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/fnmatch.c b/gettext-tools/gnulib-lib/fnmatch.c
index 4c58844..01fbd1f 100644
--- a/gettext-tools/gnulib-lib/fnmatch.c
+++ b/gettext-tools/gnulib-lib/fnmatch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1996-2007, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993, 1996-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/fnmatch.in.h b/gettext-tools/gnulib-lib/fnmatch.in.h
index eb5815a..890ee56 100644
--- a/gettext-tools/gnulib-lib/fnmatch.in.h
+++ b/gettext-tools/gnulib-lib/fnmatch.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2015 Free
+/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2016 Free
    Software Foundation, Inc.
 
    This file is part of the GNU C Library.
diff --git a/gettext-tools/gnulib-lib/fnmatch_loop.c b/gettext-tools/gnulib-lib/fnmatch_loop.c
index 48e83c6..049a48c 100644
--- a/gettext-tools/gnulib-lib/fnmatch_loop.c
+++ b/gettext-tools/gnulib-lib/fnmatch_loop.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1996-2006, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993, 1996-2006, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/fopen.c b/gettext-tools/gnulib-lib/fopen.c
index 139ede2..6c0c847 100644
--- a/gettext-tools/gnulib-lib/fopen.c
+++ b/gettext-tools/gnulib-lib/fopen.c
@@ -1,5 +1,5 @@
 /* Open a stream to a file.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/fstat.c b/gettext-tools/gnulib-lib/fstat.c
index 7a0521f..435c429 100644
--- a/gettext-tools/gnulib-lib/fstat.c
+++ b/gettext-tools/gnulib-lib/fstat.c
@@ -1,5 +1,5 @@
 /* fstat() replacement.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/fstrcmp.c b/gettext-tools/gnulib-lib/fstrcmp.c
index d40e6ef..a12f2b5 100644
--- a/gettext-tools/gnulib-lib/fstrcmp.c
+++ b/gettext-tools/gnulib-lib/fstrcmp.c
@@ -1,5 +1,5 @@
 /* Functions to make fuzzy comparisons between strings
-   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2015 Free
+   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2016 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/fstrcmp.h b/gettext-tools/gnulib-lib/fstrcmp.h
index b2a240f..0a6daeb 100644
--- a/gettext-tools/gnulib-lib/fstrcmp.h
+++ b/gettext-tools/gnulib-lib/fstrcmp.h
@@ -1,5 +1,5 @@
 /* Fuzzy string comparison.
-   Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2015 Free Software
+   Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <pmiller@agso.gov.au>
diff --git a/gettext-tools/gnulib-lib/full-write.c b/gettext-tools/gnulib-lib/full-write.c
index 027f77a..08248ad 100644
--- a/gettext-tools/gnulib-lib/full-write.c
+++ b/gettext-tools/gnulib-lib/full-write.c
@@ -1,6 +1,6 @@
 /* An interface to read and write that retries (if necessary) until complete.
 
-   Copyright (C) 1993-1994, 1997-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 1997-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/full-write.h b/gettext-tools/gnulib-lib/full-write.h
index b32b53d..586d0b5 100644
--- a/gettext-tools/gnulib-lib/full-write.h
+++ b/gettext-tools/gnulib-lib/full-write.h
@@ -1,6 +1,6 @@
 /* An interface to write() that writes all it is asked to write.
 
-   Copyright (C) 2002-2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/fwriteerror.c b/gettext-tools/gnulib-lib/fwriteerror.c
index 8e7c3ea..3581975 100644
--- a/gettext-tools/gnulib-lib/fwriteerror.c
+++ b/gettext-tools/gnulib-lib/fwriteerror.c
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/fwriteerror.h b/gettext-tools/gnulib-lib/fwriteerror.h
index 438f453..af548da 100644
--- a/gettext-tools/gnulib-lib/fwriteerror.h
+++ b/gettext-tools/gnulib-lib/fwriteerror.h
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gcd.c b/gettext-tools/gnulib-lib/gcd.c
index 414005e..effaeb1 100644
--- a/gettext-tools/gnulib-lib/gcd.c
+++ b/gettext-tools/gnulib-lib/gcd.c
@@ -1,5 +1,5 @@
 /* Arithmetic.
-   Copyright (C) 2001-2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gcd.h b/gettext-tools/gnulib-lib/gcd.h
index 56ce191..4368d98 100644
--- a/gettext-tools/gnulib-lib/gcd.h
+++ b/gettext-tools/gnulib-lib/gcd.h
@@ -1,5 +1,5 @@
 /* Arithmetic.
-   Copyright (C) 2001-2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/get-permissions.c b/gettext-tools/gnulib-lib/get-permissions.c
index 9dfb076..bf40dad 100644
--- a/gettext-tools/gnulib-lib/get-permissions.c
+++ b/gettext-tools/gnulib-lib/get-permissions.c
@@ -1,6 +1,6 @@
 /* Get permissions of a file.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
@@ -102,7 +102,7 @@ get_permissions (const char *name, int desc, mode_t mode,
      There is an API
        pathconf (name, _PC_ACL_ENABLED)
        fpathconf (desc, _PC_ACL_ENABLED)
-     that allows to determine which of the two kinds of ACLs is supported
+     that allows us to determine which of the two kinds of ACLs is supported
      for the given file.  But some file systems may implement this call
      incorrectly, so better not use it.
      When fetching the source ACL, we simply fetch both ACL types.
diff --git a/gettext-tools/gnulib-lib/getdelim.c b/gettext-tools/gnulib-lib/getdelim.c
index 88258e5..e316c91 100644
--- a/gettext-tools/gnulib-lib/getdelim.c
+++ b/gettext-tools/gnulib-lib/getdelim.c
@@ -1,5 +1,5 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2015 Free Software
+   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
diff --git a/gettext-tools/gnulib-lib/getdtablesize.c b/gettext-tools/gnulib-lib/getdtablesize.c
index 03eb7ef..d234055 100644
--- a/gettext-tools/gnulib-lib/getdtablesize.c
+++ b/gettext-tools/gnulib-lib/getdtablesize.c
@@ -1,5 +1,5 @@
 /* getdtablesize() function for platforms that don't have it.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/getline.c b/gettext-tools/gnulib-lib/getline.c
index 811c773..dfc679a 100644
--- a/gettext-tools/gnulib-lib/getline.c
+++ b/gettext-tools/gnulib-lib/getline.c
@@ -1,5 +1,5 @@
 /* getline.c --- Implementation of replacement getline function.
-   Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/getopt.c b/gettext-tools/gnulib-lib/getopt.c
index 212cbf7..8ccb901 100644
--- a/gettext-tools/gnulib-lib/getopt.c
+++ b/gettext-tools/gnulib-lib/getopt.c
@@ -2,7 +2,7 @@
    NOTE: getopt is part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to drepper@gnu.org
    before changing it!
-   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2015 Free Software
+   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/gnulib-lib/getopt.in.h b/gettext-tools/gnulib-lib/getopt.in.h
index f869970..4f6d2e7 100644
--- a/gettext-tools/gnulib-lib/getopt.in.h
+++ b/gettext-tools/gnulib-lib/getopt.in.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2015 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/gnulib-lib/getopt1.c b/gettext-tools/gnulib-lib/getopt1.c
index 2b1feb6..63db74f 100644
--- a/gettext-tools/gnulib-lib/getopt1.c
+++ b/gettext-tools/gnulib-lib/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2015 Free Software
+   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/gnulib-lib/getopt_int.h b/gettext-tools/gnulib-lib/getopt_int.h
index e893a6e..be4c22e 100644
--- a/gettext-tools/gnulib-lib/getopt_int.h
+++ b/gettext-tools/gnulib-lib/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2015 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/gnulib-lib/gettext.h b/gettext-tools/gnulib-lib/gettext.h
index f37d586..841b072 100644
--- a/gettext-tools/gnulib-lib/gettext.h
+++ b/gettext-tools/gnulib-lib/gettext.h
@@ -1,6 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 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
@@ -225,15 +225,17 @@ dcpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcgettext (domain, msg_ctxt_id, category);
+      found_translation = (translation != msg_ctxt_id);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (translation != msg_ctxt_id)
+      if (found_translation)
         return translation;
     }
   return msgid;
@@ -271,15 +273,17 @@ dcnpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+      found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (!(translation == msg_ctxt_id || translation == msgid_plural))
+      if (found_translation)
         return translation;
     }
   return (n == 1 ? msgid : msgid_plural);
diff --git a/gettext-tools/gnulib-lib/gettimeofday.c b/gettext-tools/gnulib-lib/gettimeofday.c
index e0e2e69..224ca6a 100644
--- a/gettext-tools/gnulib-lib/gettimeofday.c
+++ b/gettext-tools/gnulib-lib/gettimeofday.c
@@ -1,6 +1,6 @@
 /* Provide gettimeofday for systems that don't have it or for which it's broken.
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/gl_anyhash_list1.h b/gettext-tools/gnulib-lib/gl_anyhash_list1.h
index 87eb649..de25706 100644
--- a/gettext-tools/gnulib-lib/gl_anyhash_list1.h
+++ b/gettext-tools/gnulib-lib/gl_anyhash_list1.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a hash table with another list.
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gl_anyhash_list2.h b/gettext-tools/gnulib-lib/gl_anyhash_list2.h
index b8aa064..cace8f8 100644
--- a/gettext-tools/gnulib-lib/gl_anyhash_list2.h
+++ b/gettext-tools/gnulib-lib/gl_anyhash_list2.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a hash table with another list.
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gl_anylinked_list1.h b/gettext-tools/gnulib-lib/gl_anylinked_list1.h
index aa336e3..dcb66ec 100644
--- a/gettext-tools/gnulib-lib/gl_anylinked_list1.h
+++ b/gettext-tools/gnulib-lib/gl_anylinked_list1.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a linked list.
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gl_anylinked_list2.h b/gettext-tools/gnulib-lib/gl_anylinked_list2.h
index 5ba2806..6250c2b 100644
--- a/gettext-tools/gnulib-lib/gl_anylinked_list2.h
+++ b/gettext-tools/gnulib-lib/gl_anylinked_list2.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a linked list.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gl_array_list.c b/gettext-tools/gnulib-lib/gl_array_list.c
index 6224f40..098d8af 100644
--- a/gettext-tools/gnulib-lib/gl_array_list.c
+++ b/gettext-tools/gnulib-lib/gl_array_list.c
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by an array.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gl_array_list.h b/gettext-tools/gnulib-lib/gl_array_list.h
index e5f5683..059f9ee 100644
--- a/gettext-tools/gnulib-lib/gl_array_list.h
+++ b/gettext-tools/gnulib-lib/gl_array_list.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by an array.
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gl_linkedhash_list.c b/gettext-tools/gnulib-lib/gl_linkedhash_list.c
index 03605c5..33d9bcf 100644
--- a/gettext-tools/gnulib-lib/gl_linkedhash_list.c
+++ b/gettext-tools/gnulib-lib/gl_linkedhash_list.c
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a hash table with a linked list.
-   Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gl_linkedhash_list.h b/gettext-tools/gnulib-lib/gl_linkedhash_list.h
index 403d14f..80caa2d 100644
--- a/gettext-tools/gnulib-lib/gl_linkedhash_list.h
+++ b/gettext-tools/gnulib-lib/gl_linkedhash_list.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a hash table with a linked list.
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gl_list.h b/gettext-tools/gnulib-lib/gl_list.h
index a0c7d27..c9d05b0 100644
--- a/gettext-tools/gnulib-lib/gl_list.h
+++ b/gettext-tools/gnulib-lib/gl_list.h
@@ -1,5 +1,5 @@
 /* Abstract sequential list data type.  -*- coding: utf-8 -*-
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/gl_xlist.h b/gettext-tools/gnulib-lib/gl_xlist.h
index 7ea62c1..06824fc 100644
--- a/gettext-tools/gnulib-lib/gl_xlist.h
+++ b/gettext-tools/gnulib-lib/gl_xlist.h
@@ -1,5 +1,5 @@
 /* Abstract sequential list data type, with out-of-memory checking.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/glib/gstrfuncs.c b/gettext-tools/gnulib-lib/glib/gstrfuncs.c
index c2e43c2..7188a64 100644
--- a/gettext-tools/gnulib-lib/glib/gstrfuncs.c
+++ b/gettext-tools/gnulib-lib/glib/gstrfuncs.c
@@ -621,7 +621,7 @@ g_parse_long_long (const gchar *nptr,
   /* this code is based on on the strtol(3) code from GNU libc released under
    * the GNU General Public License.
    *
-   * Copyright (C) 1991-1992, 1994-2000, 1901-1902, 2015 Free Software
+   * Copyright (C) 1991-1992, 1994-2000, 1901-1902, 2015-2016 Free Software
    * Foundation, Inc.
    */
 #define ISSPACE(c)		((c) == ' ' || (c) == '\f' || (c) == '\n' || \
diff --git a/gettext-tools/gnulib-lib/glthread/lock.c b/gettext-tools/gnulib-lib/glthread/lock.c
index b64132a..935043b 100644
--- a/gettext-tools/gnulib-lib/glthread/lock.c
+++ b/gettext-tools/gnulib-lib/glthread/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/glthread/lock.h b/gettext-tools/gnulib-lib/glthread/lock.h
index cf3d0d9..e64506b 100644
--- a/gettext-tools/gnulib-lib/glthread/lock.h
+++ b/gettext-tools/gnulib-lib/glthread/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/glthread/threadlib.c b/gettext-tools/gnulib-lib/glthread/threadlib.c
index f01d351..be63713 100644
--- a/gettext-tools/gnulib-lib/glthread/threadlib.c
+++ b/gettext-tools/gnulib-lib/glthread/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/glthread/tls.c b/gettext-tools/gnulib-lib/glthread/tls.c
index f1c0cd7..7c1916a 100644
--- a/gettext-tools/gnulib-lib/glthread/tls.c
+++ b/gettext-tools/gnulib-lib/glthread/tls.c
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/glthread/tls.h b/gettext-tools/gnulib-lib/glthread/tls.h
index cf53a2b..63955a2 100644
--- a/gettext-tools/gnulib-lib/glthread/tls.h
+++ b/gettext-tools/gnulib-lib/glthread/tls.h
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/hard-locale.c b/gettext-tools/gnulib-lib/hard-locale.c
new file mode 100644
index 0000000..c7d9da5
--- /dev/null
+++ b/gettext-tools/gnulib-lib/hard-locale.c
@@ -0,0 +1,72 @@
+/* hard-locale.c -- Determine whether a locale is hard.
+
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2016 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "hard-locale.h"
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __GLIBC__
+# define GLIBC_VERSION __GLIBC__
+#elif defined __UCLIBC__
+# define GLIBC_VERSION 2
+#else
+# define GLIBC_VERSION 0
+#endif
+
+/* Return true if the current CATEGORY locale is hard, i.e. if you
+   can't get away with assuming traditional C or POSIX behavior.  */
+bool
+hard_locale (int category)
+{
+  bool hard = true;
+  char const *p = setlocale (category, NULL);
+
+  if (p)
+    {
+      if (2 <= GLIBC_VERSION)
+        {
+          if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+            hard = false;
+        }
+      else
+        {
+          char *locale = strdup (p);
+          if (locale)
+            {
+              /* Temporarily set the locale to the "C" and "POSIX" locales
+                 to find their names, so that we can determine whether one
+                 or the other is the caller's locale.  */
+              if (((p = setlocale (category, "C"))
+                   && strcmp (p, locale) == 0)
+                  || ((p = setlocale (category, "POSIX"))
+                      && strcmp (p, locale) == 0))
+                hard = false;
+
+              /* Restore the caller's locale.  */
+              setlocale (category, locale);
+              free (locale);
+            }
+        }
+    }
+
+  return hard;
+}
diff --git a/gettext-tools/gnulib-lib/hard-locale.h b/gettext-tools/gnulib-lib/hard-locale.h
new file mode 100644
index 0000000..7644afa
--- /dev/null
+++ b/gettext-tools/gnulib-lib/hard-locale.h
@@ -0,0 +1,25 @@
+/* Determine whether a locale is hard.
+
+   Copyright (C) 1999, 2003-2004, 2009-2016 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef HARD_LOCALE_H_
+# define HARD_LOCALE_H_ 1
+
+# include <stdbool.h>
+
+bool hard_locale (int);
+
+#endif /* HARD_LOCALE_H_ */
diff --git a/gettext-tools/gnulib-lib/hash.c b/gettext-tools/gnulib-lib/hash.c
index 89fa5ec..4202f79 100644
--- a/gettext-tools/gnulib-lib/hash.c
+++ b/gettext-tools/gnulib-lib/hash.c
@@ -1,6 +1,5 @@
 /* hash - implement simple hashing table with string based keys.
-   Copyright (C) 1994-1995, 2000-2006, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1994-1995, 2000-2006, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, October 1994.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/hash.h b/gettext-tools/gnulib-lib/hash.h
index b98e340..61c0397 100644
--- a/gettext-tools/gnulib-lib/hash.h
+++ b/gettext-tools/gnulib-lib/hash.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015 Free Software
+/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015-2016 Free Software
  * Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/html-ostream.c b/gettext-tools/gnulib-lib/html-ostream.c
index 64c816c..f1cfeda 100644
--- a/gettext-tools/gnulib-lib/html-ostream.c
+++ b/gettext-tools/gnulib-lib/html-ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "html-ostream.oo.c"
 /* Output stream that produces HTML output.
-   Copyright (C) 2006-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/html-ostream.h b/gettext-tools/gnulib-lib/html-ostream.h
index 4a33ed7..7a2ecbf 100644
--- a/gettext-tools/gnulib-lib/html-ostream.h
+++ b/gettext-tools/gnulib-lib/html-ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "html-ostream.oo.h"
 /* Output stream that produces HTML output.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/html-ostream.oo.c b/gettext-tools/gnulib-lib/html-ostream.oo.c
index afa84d3..be4fd40 100644
--- a/gettext-tools/gnulib-lib/html-ostream.oo.c
+++ b/gettext-tools/gnulib-lib/html-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream that produces HTML output.
-   Copyright (C) 2006-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/html-ostream.oo.h b/gettext-tools/gnulib-lib/html-ostream.oo.h
index 87c6f3d..d044a78 100644
--- a/gettext-tools/gnulib-lib/html-ostream.oo.h
+++ b/gettext-tools/gnulib-lib/html-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream that produces HTML output.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/html-styled-ostream.c b/gettext-tools/gnulib-lib/html-styled-ostream.c
index fb15e46..ef37350 100644
--- a/gettext-tools/gnulib-lib/html-styled-ostream.c
+++ b/gettext-tools/gnulib-lib/html-styled-ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "html-styled-ostream.oo.c"
 /* Output stream for CSS styled text, producing HTML output.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/html-styled-ostream.h b/gettext-tools/gnulib-lib/html-styled-ostream.h
index 4a0ae03..ae6544a 100644
--- a/gettext-tools/gnulib-lib/html-styled-ostream.h
+++ b/gettext-tools/gnulib-lib/html-styled-ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "html-styled-ostream.oo.h"
 /* Output stream for CSS styled text, producing HTML output.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/html-styled-ostream.oo.c b/gettext-tools/gnulib-lib/html-styled-ostream.oo.c
index ef187dd..7722347 100644
--- a/gettext-tools/gnulib-lib/html-styled-ostream.oo.c
+++ b/gettext-tools/gnulib-lib/html-styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing HTML output.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/html-styled-ostream.oo.h b/gettext-tools/gnulib-lib/html-styled-ostream.oo.h
index d66bb2e..02e7c72 100644
--- a/gettext-tools/gnulib-lib/html-styled-ostream.oo.h
+++ b/gettext-tools/gnulib-lib/html-styled-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing HTML output.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/iconv.c b/gettext-tools/gnulib-lib/iconv.c
index 28c13c5..9ce9c01 100644
--- a/gettext-tools/gnulib-lib/iconv.c
+++ b/gettext-tools/gnulib-lib/iconv.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/iconv.in.h b/gettext-tools/gnulib-lib/iconv.in.h
index 94ab806..cb1da14 100644
--- a/gettext-tools/gnulib-lib/iconv.in.h
+++ b/gettext-tools/gnulib-lib/iconv.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/iconv_close.c b/gettext-tools/gnulib-lib/iconv_close.c
index 59e0aca..d1cd793 100644
--- a/gettext-tools/gnulib-lib/iconv_close.c
+++ b/gettext-tools/gnulib-lib/iconv_close.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/iconv_open.c b/gettext-tools/gnulib-lib/iconv_open.c
index 09d042d..d5c5a52 100644
--- a/gettext-tools/gnulib-lib/iconv_open.c
+++ b/gettext-tools/gnulib-lib/iconv_open.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/iconveh.h b/gettext-tools/gnulib-lib/iconveh.h
index 118e29c..1849c39 100644
--- a/gettext-tools/gnulib-lib/iconveh.h
+++ b/gettext-tools/gnulib-lib/iconveh.h
@@ -1,5 +1,5 @@
 /* Character set conversion handler type.
-   Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/ignore-value.h b/gettext-tools/gnulib-lib/ignore-value.h
index 2e3121f..6713d96 100644
--- a/gettext-tools/gnulib-lib/ignore-value.h
+++ b/gettext-tools/gnulib-lib/ignore-value.h
@@ -1,6 +1,6 @@
 /* ignore a function return without a compiler warning.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/intprops.h b/gettext-tools/gnulib-lib/intprops.h
index ecafaf7..3152139 100644
--- a/gettext-tools/gnulib-lib/intprops.h
+++ b/gettext-tools/gnulib-lib/intprops.h
@@ -1,10 +1,10 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2016 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
-   the Free Software Foundation; either version 3 of the License, or
+   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 the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -21,6 +21,7 @@
 #define _GL_INTPROPS_H
 
 #include <limits.h>
+#include <verify.h>
 
 /* Return a value with the common real type of E and V and the value of V.  */
 #define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
@@ -36,17 +37,6 @@
    an integer.  */
 #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
 
-/* True if negative values of the signed integer type T use two's
-   complement, ones' complement, or signed magnitude representation,
-   respectively.  Much GNU code assumes two's complement, but some
-   people like to be portable to all possible C hosts.  */
-#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
-/* True if the signed integer expression E uses two's complement.  */
-#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1)
-
 /* True if the real type T is signed.  */
 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
@@ -55,18 +45,10 @@
 #define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
 
 
-/* Minimum and maximum values for integer types and expressions.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
+/* Minimum and maximum values for integer types and expressions.  */
 
 /* The maximum and minimum values for the integer type T.  */
-#define TYPE_MINIMUM(t)                                                 \
-  ((t) (! TYPE_SIGNED (t)                                               \
-        ? (t) 0                                                         \
-        : TYPE_SIGNED_MAGNITUDE (t)                                     \
-        ? ~ (t) 0                                                       \
-        : ~ TYPE_MAXIMUM (t)))
+#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
 #define TYPE_MAXIMUM(t)                                                 \
   ((t) (! TYPE_SIGNED (t)                                               \
         ? (t) -1                                                        \
@@ -76,7 +58,7 @@
    after integer promotion.  E should not have side effects.  */
 #define _GL_INT_MINIMUM(e)                                              \
   (EXPR_SIGNED (e)                                                      \
-   ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e)         \
+   ? ~ _GL_SIGNED_INT_MAXIMUM (e)                                       \
    : _GL_INT_CONVERT (e, 0))
 #define _GL_INT_MAXIMUM(e)                                              \
   (EXPR_SIGNED (e)                                                      \
@@ -85,8 +67,25 @@
 #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
   (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
 
+/* This include file assumes that signed types are two's complement without
+   padding bits; the above macros have undefined behavior otherwise.
+   If this is a problem for you, please let us know how to fix it for your host.
+   As a sanity check, test the assumption for some signed types that
+   <limits.h> bounds.  */
+verify (TYPE_MINIMUM (signed char) == SCHAR_MIN);
+verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX);
+verify (TYPE_MINIMUM (short int) == SHRT_MIN);
+verify (TYPE_MAXIMUM (short int) == SHRT_MAX);
+verify (TYPE_MINIMUM (int) == INT_MIN);
+verify (TYPE_MAXIMUM (int) == INT_MAX);
+verify (TYPE_MINIMUM (long int) == LONG_MIN);
+verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+#ifdef LLONG_MAX
+verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+#endif
 
-/* Return 1 if the __typeof__ keyword works.  This could be done by
+/* Does the __typeof__ keyword work?  This could be done by
    'configure', but for now it's easier to do it by hand.  */
 #if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
      || (0x5110 <= __SUNPRO_C && !__STDC__))
diff --git a/gettext-tools/gnulib-lib/isinf.c b/gettext-tools/gnulib-lib/isinf.c
index 3ba77c5..5a3913a 100644
--- a/gettext-tools/gnulib-lib/isinf.c
+++ b/gettext-tools/gnulib-lib/isinf.c
@@ -1,5 +1,5 @@
 /* Test for positive or negative infinity.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/isnan.c b/gettext-tools/gnulib-lib/isnan.c
index 5eb11d9..e1e57b2 100644
--- a/gettext-tools/gnulib-lib/isnan.c
+++ b/gettext-tools/gnulib-lib/isnan.c
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/isnand-nolibm.h b/gettext-tools/gnulib-lib/isnand-nolibm.h
index ca3a87a..dc47264 100644
--- a/gettext-tools/gnulib-lib/isnand-nolibm.h
+++ b/gettext-tools/gnulib-lib/isnand-nolibm.h
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/isnand.c b/gettext-tools/gnulib-lib/isnand.c
index 3fd803b..405b23a 100644
--- a/gettext-tools/gnulib-lib/isnand.c
+++ b/gettext-tools/gnulib-lib/isnand.c
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/isnanf-nolibm.h b/gettext-tools/gnulib-lib/isnanf-nolibm.h
index 1e8d75a..4e68cad 100644
--- a/gettext-tools/gnulib-lib/isnanf-nolibm.h
+++ b/gettext-tools/gnulib-lib/isnanf-nolibm.h
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/isnanf.c b/gettext-tools/gnulib-lib/isnanf.c
index 7fc5da2..d1e3fe9 100644
--- a/gettext-tools/gnulib-lib/isnanf.c
+++ b/gettext-tools/gnulib-lib/isnanf.c
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/isnanl-nolibm.h b/gettext-tools/gnulib-lib/isnanl-nolibm.h
index 22d536d..efd9199 100644
--- a/gettext-tools/gnulib-lib/isnanl-nolibm.h
+++ b/gettext-tools/gnulib-lib/isnanl-nolibm.h
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/isnanl.c b/gettext-tools/gnulib-lib/isnanl.c
index 8f05eb7..67d39d1 100644
--- a/gettext-tools/gnulib-lib/isnanl.c
+++ b/gettext-tools/gnulib-lib/isnanl.c
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/iswblank.c b/gettext-tools/gnulib-lib/iswblank.c
index 94be115..8d47ee5 100644
--- a/gettext-tools/gnulib-lib/iswblank.c
+++ b/gettext-tools/gnulib-lib/iswblank.c
@@ -1,5 +1,5 @@
 /* Test wide character for being blank.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/itold.c b/gettext-tools/gnulib-lib/itold.c
index 1eee03e..5533392 100644
--- a/gettext-tools/gnulib-lib/itold.c
+++ b/gettext-tools/gnulib-lib/itold.c
@@ -1,5 +1,5 @@
 /* Replacement for 'int' to 'long double' conversion routine.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/javacomp.c b/gettext-tools/gnulib-lib/javacomp.c
index c7571c8..a318c0d 100644
--- a/gettext-tools/gnulib-lib/javacomp.c
+++ b/gettext-tools/gnulib-lib/javacomp.c
@@ -1,5 +1,5 @@
 /* Compile a Java program.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/javacomp.h b/gettext-tools/gnulib-lib/javacomp.h
index a2f651e..0738af5 100644
--- a/gettext-tools/gnulib-lib/javacomp.h
+++ b/gettext-tools/gnulib-lib/javacomp.h
@@ -1,5 +1,5 @@
 /* Compile a Java program.
-   Copyright (C) 2001-2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/javaexec.c b/gettext-tools/gnulib-lib/javaexec.c
index e6bfd37..28649dd 100644
--- a/gettext-tools/gnulib-lib/javaexec.c
+++ b/gettext-tools/gnulib-lib/javaexec.c
@@ -1,5 +1,5 @@
 /* Execute a Java program.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/javaexec.h b/gettext-tools/gnulib-lib/javaexec.h
index b50ce3a..9935e8f 100644
--- a/gettext-tools/gnulib-lib/javaexec.h
+++ b/gettext-tools/gnulib-lib/javaexec.h
@@ -1,5 +1,5 @@
 /* Execute a Java program.
-   Copyright (C) 2001-2002, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/javaversion.c b/gettext-tools/gnulib-lib/javaversion.c
index 7eda578..d760c32 100644
--- a/gettext-tools/gnulib-lib/javaversion.c
+++ b/gettext-tools/gnulib-lib/javaversion.c
@@ -1,5 +1,5 @@
 /* Determine the Java version supported by javaexec.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/javaversion.h b/gettext-tools/gnulib-lib/javaversion.h
index 41d21b7..d55a3c4 100644
--- a/gettext-tools/gnulib-lib/javaversion.h
+++ b/gettext-tools/gnulib-lib/javaversion.h
@@ -1,5 +1,5 @@
 /* Determine the Java version supported by javaexec.
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/javaversion.java b/gettext-tools/gnulib-lib/javaversion.java
index 99a7bbe..4b222d4 100644
--- a/gettext-tools/gnulib-lib/javaversion.java
+++ b/gettext-tools/gnulib-lib/javaversion.java
@@ -1,5 +1,5 @@
 /* Show the Java version.
- * Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/langinfo.in.h b/gettext-tools/gnulib-lib/langinfo.in.h
index 04fd535..e11617c 100644
--- a/gettext-tools/gnulib-lib/langinfo.in.h
+++ b/gettext-tools/gnulib-lib/langinfo.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <langinfo.h>.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/localcharset.c b/gettext-tools/gnulib-lib/localcharset.c
index 1f02aa5..b2a0369 100644
--- a/gettext-tools/gnulib-lib/localcharset.c
+++ b/gettext-tools/gnulib-lib/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/localcharset.h b/gettext-tools/gnulib-lib/localcharset.h
index c5e6d46..915182e 100644
--- a/gettext-tools/gnulib-lib/localcharset.h
+++ b/gettext-tools/gnulib-lib/localcharset.h
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU CHARSET Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/locale.in.h b/gettext-tools/gnulib-lib/locale.in.h
index 05e974d..4083507 100644
--- a/gettext-tools/gnulib-lib/locale.in.h
+++ b/gettext-tools/gnulib-lib/locale.in.h
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/localename.c b/gettext-tools/gnulib-lib/localename.c
index c256ad5..e67bd01 100644
--- a/gettext-tools/gnulib-lib/localename.c
+++ b/gettext-tools/gnulib-lib/localename.c
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 1995-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 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
diff --git a/gettext-tools/gnulib-lib/localename.h b/gettext-tools/gnulib-lib/localename.h
index 13c126d..17f0d85 100644
--- a/gettext-tools/gnulib-lib/localename.h
+++ b/gettext-tools/gnulib-lib/localename.h
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/log10.c b/gettext-tools/gnulib-lib/log10.c
index a6b037c..35be15c 100644
--- a/gettext-tools/gnulib-lib/log10.c
+++ b/gettext-tools/gnulib-lib/log10.c
@@ -1,5 +1,5 @@
 /* Base 10 logarithmic function.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 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
diff --git a/gettext-tools/gnulib-lib/lstat.c b/gettext-tools/gnulib-lib/lstat.c
index 31dee13..03b0634 100644
--- a/gettext-tools/gnulib-lib/lstat.c
+++ b/gettext-tools/gnulib-lib/lstat.c
@@ -1,6 +1,6 @@
 /* Work around a bug of lstat on some systems
 
-   Copyright (C) 1997-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997-2006, 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/malloc.c b/gettext-tools/gnulib-lib/malloc.c
index 00800a2..e9b01d2 100644
--- a/gettext-tools/gnulib-lib/malloc.c
+++ b/gettext-tools/gnulib-lib/malloc.c
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/malloca.c b/gettext-tools/gnulib-lib/malloca.c
index 198a96c..a613277 100644
--- a/gettext-tools/gnulib-lib/malloca.c
+++ b/gettext-tools/gnulib-lib/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/malloca.h b/gettext-tools/gnulib-lib/malloca.h
index 7a4190c..fa27a9e 100644
--- a/gettext-tools/gnulib-lib/malloca.h
+++ b/gettext-tools/gnulib-lib/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/math.in.h b/gettext-tools/gnulib-lib/math.in.h
index 62a089a..e3fd994 100644
--- a/gettext-tools/gnulib-lib/math.in.h
+++ b/gettext-tools/gnulib-lib/math.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <math.h>.
 
-   Copyright (C) 2002-2003, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2007-2016 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
@@ -2205,7 +2205,8 @@ _GL_WARN_REAL_FLOATING_DECL (isnan);
 
 
 #if @GNULIB_SIGNBIT@
-# if @REPLACE_SIGNBIT_USING_GCC@
+# if (@REPLACE_SIGNBIT_USING_GCC@ \
+      && (!defined __cplusplus || __cplusplus < 201103))
 #  undef signbit
    /* GCC 4.0 and newer provides three built-ins for signbit.  */
 #  define signbit(x) \
diff --git a/gettext-tools/gnulib-lib/mbchar.c b/gettext-tools/gnulib-lib/mbchar.c
index ae9b7eb..27796c3 100644
--- a/gettext-tools/gnulib-lib/mbchar.c
+++ b/gettext-tools/gnulib-lib/mbchar.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/mbchar.h b/gettext-tools/gnulib-lib/mbchar.h
index fcdefaf..2017d86 100644
--- a/gettext-tools/gnulib-lib/mbchar.h
+++ b/gettext-tools/gnulib-lib/mbchar.h
@@ -1,5 +1,5 @@
 /* Multibyte character data type.
-   Copyright (C) 2001, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/mbiter.h b/gettext-tools/gnulib-lib/mbiter.h
index ccc1d19..d72b0a7 100644
--- a/gettext-tools/gnulib-lib/mbiter.h
+++ b/gettext-tools/gnulib-lib/mbiter.h
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/mbrtowc.c b/gettext-tools/gnulib-lib/mbrtowc.c
index e49d55b..cdd874b 100644
--- a/gettext-tools/gnulib-lib/mbrtowc.c
+++ b/gettext-tools/gnulib-lib/mbrtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,11 @@
 /* Specification.  */
 #include <wchar.h>
 
+#if C_LOCALE_MAYBE_EILSEQ
+# include "hard-locale.h"
+# include <locale.h>
+#endif
+
 #if GNULIB_defined_mbstate_t
 /* Implement mbrtowc() on top of mbtowc().  */
 
@@ -328,6 +333,9 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 size_t
 rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
+  size_t ret;
+  wchar_t wc;
+
 # if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
   if (s == NULL)
     {
@@ -342,6 +350,9 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
     return (size_t) -2;
 # endif
 
+  if (! pwc)
+    pwc = &wc;
+
 # if MBRTOWC_RETVAL_BUG
   {
     static mbstate_t internal_state;
@@ -357,8 +368,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
         size_t count = 0;
         for (; n > 0; s++, n--)
           {
-            wchar_t wc;
-            size_t ret = mbrtowc (&wc, s, 1, ps);
+            ret = mbrtowc (&wc, s, 1, ps);
 
             if (ret == (size_t)(-1))
               return (size_t)(-1);
@@ -366,8 +376,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
             if (ret != (size_t)(-2))
               {
                 /* The multibyte character has been completed.  */
-                if (pwc != NULL)
-                  *pwc = wc;
+                *pwc = wc;
                 return (wc == 0 ? 0 : count);
               }
           }
@@ -376,32 +385,23 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
   }
 # endif
 
-# if MBRTOWC_NUL_RETVAL_BUG
-  {
-    wchar_t wc;
-    size_t ret = mbrtowc (&wc, s, n, ps);
+  ret = mbrtowc (pwc, s, n, ps);
 
-    if (ret != (size_t)(-1) && ret != (size_t)(-2))
-      {
-        if (pwc != NULL)
-          *pwc = wc;
-        if (wc == 0)
-          ret = 0;
-      }
-    return ret;
-  }
-# else
-  {
-#   if MBRTOWC_NULL_ARG1_BUG
-    wchar_t dummy;
-
-    if (pwc == NULL)
-      pwc = &dummy;
-#   endif
+# if MBRTOWC_NUL_RETVAL_BUG
+  if (ret < (size_t) -2 && !*pwc)
+    return 0;
+# endif
 
-    return mbrtowc (pwc, s, n, ps);
-  }
+# if C_LOCALE_MAYBE_EILSEQ
+  if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
+    {
+      unsigned char uc = *s;
+      *pwc = uc;
+      return 1;
+    }
 # endif
+
+  return ret;
 }
 
 #endif
diff --git a/gettext-tools/gnulib-lib/mbsinit.c b/gettext-tools/gnulib-lib/mbsinit.c
index 4effdd8..372b523 100644
--- a/gettext-tools/gnulib-lib/mbsinit.c
+++ b/gettext-tools/gnulib-lib/mbsinit.c
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/mbslen.c b/gettext-tools/gnulib-lib/mbslen.c
index 011f821..ed13a42 100644
--- a/gettext-tools/gnulib-lib/mbslen.c
+++ b/gettext-tools/gnulib-lib/mbslen.c
@@ -1,5 +1,5 @@
 /* Counting the multibyte characters in a string.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/mbsrtowcs-impl.h b/gettext-tools/gnulib-lib/mbsrtowcs-impl.h
index a0f4271..f99fa34 100644
--- a/gettext-tools/gnulib-lib/mbsrtowcs-impl.h
+++ b/gettext-tools/gnulib-lib/mbsrtowcs-impl.h
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/mbsrtowcs-state.c b/gettext-tools/gnulib-lib/mbsrtowcs-state.c
index 522eb69..905547a 100644
--- a/gettext-tools/gnulib-lib/mbsrtowcs-state.c
+++ b/gettext-tools/gnulib-lib/mbsrtowcs-state.c
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/mbsrtowcs.c b/gettext-tools/gnulib-lib/mbsrtowcs.c
index c37eba7..54bf6f7 100644
--- a/gettext-tools/gnulib-lib/mbsrtowcs.c
+++ b/gettext-tools/gnulib-lib/mbsrtowcs.c
@@ -1,5 +1,5 @@
 /* Convert string to wide string.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/mbsstr.c b/gettext-tools/gnulib-lib/mbsstr.c
index 6d5239e..bc738d4 100644
--- a/gettext-tools/gnulib-lib/mbsstr.c
+++ b/gettext-tools/gnulib-lib/mbsstr.c
@@ -1,5 +1,5 @@
 /* Searching in a string.  -*- coding: utf-8 -*-
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/mbswidth.c b/gettext-tools/gnulib-lib/mbswidth.c
index 75ca79a..a235bf1 100644
--- a/gettext-tools/gnulib-lib/mbswidth.c
+++ b/gettext-tools/gnulib-lib/mbswidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 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
diff --git a/gettext-tools/gnulib-lib/mbswidth.h b/gettext-tools/gnulib-lib/mbswidth.h
index f5b0fc3..b04cfe4 100644
--- a/gettext-tools/gnulib-lib/mbswidth.h
+++ b/gettext-tools/gnulib-lib/mbswidth.h
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2004, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2004, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/mbuiter.h b/gettext-tools/gnulib-lib/mbuiter.h
index acdec29..aad4fea 100644
--- a/gettext-tools/gnulib-lib/mbuiter.h
+++ b/gettext-tools/gnulib-lib/mbuiter.h
@@ -1,5 +1,5 @@
 /* Iterating through multibyte strings: macros for multi-byte encodings.
-   Copyright (C) 2001, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/memchr.c b/gettext-tools/gnulib-lib/memchr.c
index f74cc9a..b565542 100644
--- a/gettext-tools/gnulib-lib/memchr.c
+++ b/gettext-tools/gnulib-lib/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/gettext-tools/gnulib-lib/memset.c b/gettext-tools/gnulib-lib/memset.c
index 5490f8e..352ca1e 100644
--- a/gettext-tools/gnulib-lib/memset.c
+++ b/gettext-tools/gnulib-lib/memset.c
@@ -1,5 +1,5 @@
 /* memset.c -- set an area of memory to a given value
-   Copyright (C) 1991, 2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2003, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/minmax.h b/gettext-tools/gnulib-lib/minmax.h
index 919678d..be6b321 100644
--- a/gettext-tools/gnulib-lib/minmax.h
+++ b/gettext-tools/gnulib-lib/minmax.h
@@ -1,5 +1,5 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2015 Free Software
+   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/mkdtemp.c b/gettext-tools/gnulib-lib/mkdtemp.c
index 9555392..c1b05fd 100644
--- a/gettext-tools/gnulib-lib/mkdtemp.c
+++ b/gettext-tools/gnulib-lib/mkdtemp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2015 Free Software
+/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/gnulib-lib/moo.h b/gettext-tools/gnulib-lib/moo.h
index 2925b58..d9e6328 100644
--- a/gettext-tools/gnulib-lib/moo.h
+++ b/gettext-tools/gnulib-lib/moo.h
@@ -1,5 +1,5 @@
 /* Minimal object-oriented facilities for C.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/msvc-inval.c b/gettext-tools/gnulib-lib/msvc-inval.c
index a1f1dc0..baaf39e 100644
--- a/gettext-tools/gnulib-lib/msvc-inval.c
+++ b/gettext-tools/gnulib-lib/msvc-inval.c
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/msvc-inval.h b/gettext-tools/gnulib-lib/msvc-inval.h
index 8b07269..027c949 100644
--- a/gettext-tools/gnulib-lib/msvc-inval.h
+++ b/gettext-tools/gnulib-lib/msvc-inval.h
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/msvc-nothrow.c b/gettext-tools/gnulib-lib/msvc-nothrow.c
index 90cf801..ba75bbf 100644
--- a/gettext-tools/gnulib-lib/msvc-nothrow.c
+++ b/gettext-tools/gnulib-lib/msvc-nothrow.c
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/msvc-nothrow.h b/gettext-tools/gnulib-lib/msvc-nothrow.h
index 67b151e..3493b84 100644
--- a/gettext-tools/gnulib-lib/msvc-nothrow.h
+++ b/gettext-tools/gnulib-lib/msvc-nothrow.h
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/obstack.c b/gettext-tools/gnulib-lib/obstack.c
index dd6e1f7..24b67a5 100644
--- a/gettext-tools/gnulib-lib/obstack.c
+++ b/gettext-tools/gnulib-lib/obstack.c
@@ -1,5 +1,5 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988-2015 Free Software Foundation, Inc.
+   Copyright (C) 1988-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gettext-tools/gnulib-lib/obstack.h b/gettext-tools/gnulib-lib/obstack.h
index f7e791b..1c25fbc 100644
--- a/gettext-tools/gnulib-lib/obstack.h
+++ b/gettext-tools/gnulib-lib/obstack.h
@@ -1,5 +1,5 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988-2015 Free Software Foundation, Inc.
+   Copyright (C) 1988-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gettext-tools/gnulib-lib/open.c b/gettext-tools/gnulib-lib/open.c
index 95c7811..e9c3120 100644
--- a/gettext-tools/gnulib-lib/open.c
+++ b/gettext-tools/gnulib-lib/open.c
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/opendir.c b/gettext-tools/gnulib-lib/opendir.c
index 9f53110..a135fd8 100644
--- a/gettext-tools/gnulib-lib/opendir.c
+++ b/gettext-tools/gnulib-lib/opendir.c
@@ -1,5 +1,5 @@
 /* Start reading the entries of a directory.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
@@ -40,6 +40,11 @@
 # include <unistd.h>
 #endif
 
+#ifdef __KLIBC__
+# include <io.h>
+# include <fcntl.h>
+#endif
+
 DIR *
 opendir (const char *dir_name)
 {
@@ -51,6 +56,22 @@ opendir (const char *dir_name)
   if (dirp == NULL)
     return NULL;
 
+# ifdef __KLIBC__
+  {
+    int fd = open (dir_name, O_RDONLY);
+    if (fd == -1 || _gl_register_dirp_fd (fd, dirp))
+      {
+        int saved_errno = errno;
+
+        close (fd);
+        closedir (dirp);
+
+        errno = saved_errno;
+
+        return NULL;
+      }
+  }
+# endif
 #else
 
   char dir_name_mask[MAX_PATH + 1 + 1 + 1];
diff --git a/gettext-tools/gnulib-lib/ostream.c b/gettext-tools/gnulib-lib/ostream.c
index 0cce0d2..380ef20 100644
--- a/gettext-tools/gnulib-lib/ostream.c
+++ b/gettext-tools/gnulib-lib/ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "ostream.oo.c"
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/ostream.h b/gettext-tools/gnulib-lib/ostream.h
index 7fc6979..488b1de 100644
--- a/gettext-tools/gnulib-lib/ostream.h
+++ b/gettext-tools/gnulib-lib/ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "ostream.oo.h"
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/ostream.oo.c b/gettext-tools/gnulib-lib/ostream.oo.c
index 3c178fa..443b03c 100644
--- a/gettext-tools/gnulib-lib/ostream.oo.c
+++ b/gettext-tools/gnulib-lib/ostream.oo.c
@@ -1,5 +1,5 @@
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/ostream.oo.h b/gettext-tools/gnulib-lib/ostream.oo.h
index 87199df..d0882b9 100644
--- a/gettext-tools/gnulib-lib/ostream.oo.h
+++ b/gettext-tools/gnulib-lib/ostream.oo.h
@@ -1,5 +1,5 @@
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/pathmax.h b/gettext-tools/gnulib-lib/pathmax.h
index 2f3b64f..aee22f8 100644
--- a/gettext-tools/gnulib-lib/pathmax.h
+++ b/gettext-tools/gnulib-lib/pathmax.h
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2015 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/pipe-filter-aux.c b/gettext-tools/gnulib-lib/pipe-filter-aux.c
index 4e9567f..7839d51 100644
--- a/gettext-tools/gnulib-lib/pipe-filter-aux.c
+++ b/gettext-tools/gnulib-lib/pipe-filter-aux.c
@@ -1,5 +1,5 @@
 /* Auxiliary code for filtering of data through a subprocess.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 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
diff --git a/gettext-tools/gnulib-lib/pipe-filter-aux.h b/gettext-tools/gnulib-lib/pipe-filter-aux.h
index 132cc54..50ad62c 100644
--- a/gettext-tools/gnulib-lib/pipe-filter-aux.h
+++ b/gettext-tools/gnulib-lib/pipe-filter-aux.h
@@ -1,5 +1,5 @@
 /* Auxiliary code for filtering of data through a subprocess.
-   Copyright (C) 2001-2003, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
@@ -35,8 +35,9 @@ _GL_INLINE_HEADER_BEGIN
    looping while waiting for the child.  Not good.  But hardly any platform
    lacks select() nowadays.)  */
 
-/* On BeOS select() works only on sockets, not on normal file descriptors.  */
-#ifdef __BEOS__
+/* On BeOS and OS/2 kLIBC select() works only on sockets, not on normal file
+   descriptors.  */
+#if defined __BEOS__ || defined __KLIBC__
 # undef HAVE_SELECT
 #endif
 
diff --git a/gettext-tools/gnulib-lib/pipe-filter-ii.c b/gettext-tools/gnulib-lib/pipe-filter-ii.c
index 88b0d0d..28feb46 100644
--- a/gettext-tools/gnulib-lib/pipe-filter-ii.c
+++ b/gettext-tools/gnulib-lib/pipe-filter-ii.c
@@ -1,5 +1,5 @@
 /* Filtering of data through a subprocess.
-   Copyright (C) 2001-2003, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
@@ -27,6 +27,127 @@
 #include <unistd.h>
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 # include <windows.h>
+#elif defined __KLIBC__
+# define INCL_DOS
+# include <os2.h>
+
+/* Simple implementation of Win32 APIs */
+
+# define WINAPI
+
+typedef struct _HANDLE
+{
+  TID tid;
+  HEV hevDone;
+  unsigned int WINAPI (*start) (void *);
+  void *arg;
+} *HANDLE;
+
+typedef ULONG DWORD;
+
+static void
+start_wrapper (void *arg)
+{
+  HANDLE h = (HANDLE) arg;
+
+  h->start (h->arg);
+
+  DosPostEventSem (h->hevDone);
+  _endthread ();
+}
+
+static HANDLE
+_beginthreadex (void *s, unsigned n, unsigned int WINAPI (*start) (void *),
+                void *arg, unsigned fl, unsigned *th)
+{
+  HANDLE h;
+
+  h = malloc (sizeof (*h));
+  if (!h)
+    return NULL;
+
+  if (DosCreateEventSem (NULL, &h->hevDone, 0, FALSE))
+    goto exit_free;
+
+  h->start = start;
+  h->arg = arg;
+
+  h->tid = _beginthread (start_wrapper, NULL, n, (void *) h);
+  if (h->tid == -1)
+    goto exit_close_event_sem;
+
+  return h;
+
+ exit_close_event_sem:
+  DosCloseEventSem (h->hevDone);
+
+ exit_free:
+  free (h);
+
+  return NULL;
+}
+
+static BOOL
+CloseHandle (HANDLE h)
+{
+  DosCloseEventSem (h->hevDone);
+  free (h);
+}
+
+# define _endthreadex(x) return (x)
+# define TerminateThread(h, e) DosKillThread (h->tid)
+
+# define GetLastError()  -1
+
+# ifndef ERROR_NO_DATA
+#  define ERROR_NO_DATA 232
+# endif
+
+# define INFINITE SEM_INDEFINITE_WAIT
+# define WAIT_OBJECT_0  0
+
+static DWORD
+WaitForSingleObject (HANDLE h, DWORD ms)
+{
+  return DosWaitEventSem (h->hevDone, ms) == 0 ? WAIT_OBJECT_0 : (DWORD) -1;
+}
+
+static DWORD
+WaitForMultipleObjects (DWORD nCount, const HANDLE *pHandles, BOOL bWaitAll,
+                        DWORD ms)
+{
+  HMUX hmux;
+  PSEMRECORD psr;
+  ULONG ulUser;
+  ULONG rc = (ULONG) -1;
+  DWORD i;
+
+  psr = malloc (sizeof (*psr) * nCount);
+  if (!psr)
+    goto exit_return;
+
+  for (i = 0; i < nCount; ++i)
+    {
+      psr[i].hsemCur = (HSEM) pHandles[i]->hevDone;
+      psr[i].ulUser  = WAIT_OBJECT_0 + i;
+    }
+
+  if (DosCreateMuxWaitSem (NULL, &hmux, nCount, psr,
+                           bWaitAll ? DCMW_WAIT_ALL : DCMW_WAIT_ANY))
+    goto exit_free;
+
+  rc = DosWaitMuxWaitSem (hmux, ms, &ulUser);
+  DosCloseMuxWaitSem (hmux);
+
+ exit_free:
+  free (psr);
+
+ exit_return:
+  if (rc)
+    return (DWORD) -1;
+
+  return ulUser;
+}
 #else
 # include <signal.h>
 # include <sys/select.h>
@@ -41,7 +162,8 @@
 
 #include "pipe-filter-aux.h"
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if (((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+     || defined __KLIBC__)
 
 struct locals
 {
@@ -143,7 +265,8 @@ pipe_filter_ii_execute (const char *progname,
 {
   pid_t child;
   int fd[2];
-#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#if !(((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+      || defined __KLIBC__)
   struct sigaction orig_sigpipe_action;
 #endif
 
@@ -154,7 +277,8 @@ pipe_filter_ii_execute (const char *progname,
   if (child == -1)
     return -1;
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if (((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+     || defined __KLIBC__)
   /* Native Windows API.  */
   /* Pipes have a non-blocking mode, see function SetNamedPipeHandleState and
      the article "Named Pipe Type, Read, and Wait Modes", but Microsoft's
@@ -462,7 +586,8 @@ pipe_filter_ii_execute (const char *progname,
   {
     int saved_errno = errno;
     close (fd[1]);
-#if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)
+#if !(((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+      || defined __KLIBC__)
     if (sigaction (SIGPIPE, &orig_sigpipe_action, NULL) < 0)
       abort ();
 #endif
diff --git a/gettext-tools/gnulib-lib/pipe-filter.h b/gettext-tools/gnulib-lib/pipe-filter.h
index ab60635..3c0d16f 100644
--- a/gettext-tools/gnulib-lib/pipe-filter.h
+++ b/gettext-tools/gnulib-lib/pipe-filter.h
@@ -1,5 +1,5 @@
 /* Filtering of data through a subprocess.  -*- coding: utf-8 -*-
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2009,
    and Paolo Bonzini <bonzini@gnu.org>, 2009.
 
diff --git a/gettext-tools/gnulib-lib/pipe-safer.c b/gettext-tools/gnulib-lib/pipe-safer.c
index 91b0fe7..fc6144e 100644
--- a/gettext-tools/gnulib-lib/pipe-safer.c
+++ b/gettext-tools/gnulib-lib/pipe-safer.c
@@ -1,5 +1,5 @@
 /* Invoke pipe, but avoid some glitches.
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/pipe2-safer.c b/gettext-tools/gnulib-lib/pipe2-safer.c
index 1993ba9..4b7084f 100644
--- a/gettext-tools/gnulib-lib/pipe2-safer.c
+++ b/gettext-tools/gnulib-lib/pipe2-safer.c
@@ -1,5 +1,5 @@
 /* Invoke pipe2, but avoid some glitches.
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/pipe2.c b/gettext-tools/gnulib-lib/pipe2.c
index 89b982b..f8912f2 100644
--- a/gettext-tools/gnulib-lib/pipe2.c
+++ b/gettext-tools/gnulib-lib/pipe2.c
@@ -1,5 +1,5 @@
 /* Create a pipe, with specific opening flags.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/printf-args.c b/gettext-tools/gnulib-lib/printf-args.c
index da17efb..cfaed99 100644
--- a/gettext-tools/gnulib-lib/printf-args.c
+++ b/gettext-tools/gnulib-lib/printf-args.c
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/printf-args.h b/gettext-tools/gnulib-lib/printf-args.h
index 387976c..256c413 100644
--- a/gettext-tools/gnulib-lib/printf-args.h
+++ b/gettext-tools/gnulib-lib/printf-args.h
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/printf-parse.c b/gettext-tools/gnulib-lib/printf-parse.c
index 40d0a22..fad5d3d 100644
--- a/gettext-tools/gnulib-lib/printf-parse.c
+++ b/gettext-tools/gnulib-lib/printf-parse.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2016 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
diff --git a/gettext-tools/gnulib-lib/printf-parse.h b/gettext-tools/gnulib-lib/printf-parse.h
index fda6704..a46d946 100644
--- a/gettext-tools/gnulib-lib/printf-parse.h
+++ b/gettext-tools/gnulib-lib/printf-parse.h
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/progname.c b/gettext-tools/gnulib-lib/progname.c
index fe93bca..debb760 100644
--- a/gettext-tools/gnulib-lib/progname.c
+++ b/gettext-tools/gnulib-lib/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/progname.h b/gettext-tools/gnulib-lib/progname.h
index 15ca3a2..526828f 100644
--- a/gettext-tools/gnulib-lib/progname.h
+++ b/gettext-tools/gnulib-lib/progname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/progreloc.c b/gettext-tools/gnulib-lib/progreloc.c
index 1d2b4b3..6f06897 100644
--- a/gettext-tools/gnulib-lib/progreloc.c
+++ b/gettext-tools/gnulib-lib/progreloc.c
@@ -1,5 +1,5 @@
 /* Provide relocatable programs.
-   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/propername.c b/gettext-tools/gnulib-lib/propername.c
index 293e7e3..90ad284 100644
--- a/gettext-tools/gnulib-lib/propername.c
+++ b/gettext-tools/gnulib-lib/propername.c
@@ -1,5 +1,5 @@
 /* Localization of proper names.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/propername.h b/gettext-tools/gnulib-lib/propername.h
index 68e617e..83fac08 100644
--- a/gettext-tools/gnulib-lib/propername.h
+++ b/gettext-tools/gnulib-lib/propername.h
@@ -1,5 +1,5 @@
 /* Localization of proper names.  -*- coding: utf-8 -*-
-   Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/qcopy-acl.c b/gettext-tools/gnulib-lib/qcopy-acl.c
index 9db9033..c7bdfbb 100644
--- a/gettext-tools/gnulib-lib/qcopy-acl.c
+++ b/gettext-tools/gnulib-lib/qcopy-acl.c
@@ -1,6 +1,6 @@
 /* Copy access control list from one file to another.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/qset-acl.c b/gettext-tools/gnulib-lib/qset-acl.c
index 1ebec22..77227dc 100644
--- a/gettext-tools/gnulib-lib/qset-acl.c
+++ b/gettext-tools/gnulib-lib/qset-acl.c
@@ -1,6 +1,6 @@
 /* qset-acl.c - set access control list equivalent to a mode
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/quote.h b/gettext-tools/gnulib-lib/quote.h
index 28c05fd..b53d0ea 100644
--- a/gettext-tools/gnulib-lib/quote.h
+++ b/gettext-tools/gnulib-lib/quote.h
@@ -1,6 +1,6 @@
 /* quote.h - prototypes for quote.c
 
-   Copyright (C) 1998-2001, 2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2001, 2003, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/quotearg.c b/gettext-tools/gnulib-lib/quotearg.c
index a0a0e25..73a5084 100644
--- a/gettext-tools/gnulib-lib/quotearg.c
+++ b/gettext-tools/gnulib-lib/quotearg.c
@@ -1,6 +1,6 @@
 /* quotearg.c - quote arguments for output
 
-   Copyright (C) 1998-2002, 2004-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2002, 2004-2016 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
diff --git a/gettext-tools/gnulib-lib/quotearg.h b/gettext-tools/gnulib-lib/quotearg.h
index b9eb31d..bc29052 100644
--- a/gettext-tools/gnulib-lib/quotearg.h
+++ b/gettext-tools/gnulib-lib/quotearg.h
@@ -1,6 +1,6 @@
 /* quotearg.h - quote arguments for output
 
-   Copyright (C) 1998-2002, 2004, 2006, 2008-2015 Free Software Foundation,
+   Copyright (C) 1998-2002, 2004, 2006, 2008-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/raise.c b/gettext-tools/gnulib-lib/raise.c
index d6ba2a1..bf24c3e 100644
--- a/gettext-tools/gnulib-lib/raise.c
+++ b/gettext-tools/gnulib-lib/raise.c
@@ -1,6 +1,6 @@
 /* Provide a non-threads replacement for the POSIX raise function.
 
-   Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/rawmemchr.c b/gettext-tools/gnulib-lib/rawmemchr.c
index a6380ba..dbe01bd 100644
--- a/gettext-tools/gnulib-lib/rawmemchr.c
+++ b/gettext-tools/gnulib-lib/rawmemchr.c
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/read.c b/gettext-tools/gnulib-lib/read.c
index 3d8eefa..23b2411 100644
--- a/gettext-tools/gnulib-lib/read.c
+++ b/gettext-tools/gnulib-lib/read.c
@@ -1,5 +1,5 @@
 /* POSIX compatible read() function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/readdir.c b/gettext-tools/gnulib-lib/readdir.c
index 8646aac..76b7e9d 100644
--- a/gettext-tools/gnulib-lib/readdir.c
+++ b/gettext-tools/gnulib-lib/readdir.c
@@ -1,5 +1,5 @@
 /* Read the next entry of a directory.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/readlink.c b/gettext-tools/gnulib-lib/readlink.c
index 965c3e2..e6c3925 100644
--- a/gettext-tools/gnulib-lib/readlink.c
+++ b/gettext-tools/gnulib-lib/readlink.c
@@ -1,5 +1,5 @@
 /* Stub for readlink().
-   Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/realloc.c b/gettext-tools/gnulib-lib/realloc.c
index 068b081..83cb44e 100644
--- a/gettext-tools/gnulib-lib/realloc.c
+++ b/gettext-tools/gnulib-lib/realloc.c
@@ -1,6 +1,6 @@
 /* realloc() function that is glibc compatible.
 
-   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2015 Free Software
+   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/ref-add.sin b/gettext-tools/gnulib-lib/ref-add.sin
index 6cbe5b5..42d3ab0 100644
--- a/gettext-tools/gnulib-lib/ref-add.sin
+++ b/gettext-tools/gnulib-lib/ref-add.sin
@@ -1,6 +1,6 @@
 # Add this package to a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/ref-del.sin b/gettext-tools/gnulib-lib/ref-del.sin
index f50cf0a..c77b33b 100644
--- a/gettext-tools/gnulib-lib/ref-del.sin
+++ b/gettext-tools/gnulib-lib/ref-del.sin
@@ -1,6 +1,6 @@
 # Remove this package from a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/relocatable.c b/gettext-tools/gnulib-lib/relocatable.c
index bed882d..7a59595 100644
--- a/gettext-tools/gnulib-lib/relocatable.c
+++ b/gettext-tools/gnulib-lib/relocatable.c
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/relocatable.h b/gettext-tools/gnulib-lib/relocatable.h
index c8911b2..4081f22 100644
--- a/gettext-tools/gnulib-lib/relocatable.h
+++ b/gettext-tools/gnulib-lib/relocatable.h
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003, 2005, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/relocwrapper.c b/gettext-tools/gnulib-lib/relocwrapper.c
index f85cf9a..5eefa2b 100644
--- a/gettext-tools/gnulib-lib/relocwrapper.c
+++ b/gettext-tools/gnulib-lib/relocwrapper.c
@@ -1,5 +1,5 @@
 /* Relocating wrapper program.
-   Copyright (C) 2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/rmdir.c b/gettext-tools/gnulib-lib/rmdir.c
index ae21d54..4949df2 100644
--- a/gettext-tools/gnulib-lib/rmdir.c
+++ b/gettext-tools/gnulib-lib/rmdir.c
@@ -1,6 +1,6 @@
 /* Work around rmdir bugs.
 
-   Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2015 Free Software
+   Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/safe-read.c b/gettext-tools/gnulib-lib/safe-read.c
index dbb6338..3dde5b5 100644
--- a/gettext-tools/gnulib-lib/safe-read.c
+++ b/gettext-tools/gnulib-lib/safe-read.c
@@ -1,6 +1,6 @@
 /* An interface to read and write that retries after interrupts.
 
-   Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2015 Free Software
+   Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/safe-read.h b/gettext-tools/gnulib-lib/safe-read.h
index b5d408a..b99586a 100644
--- a/gettext-tools/gnulib-lib/safe-read.h
+++ b/gettext-tools/gnulib-lib/safe-read.h
@@ -1,5 +1,5 @@
 /* An interface to read() that retries after interrupts.
-   Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/safe-write.c b/gettext-tools/gnulib-lib/safe-write.c
index 4c178f5..acd7aee 100644
--- a/gettext-tools/gnulib-lib/safe-write.c
+++ b/gettext-tools/gnulib-lib/safe-write.c
@@ -1,5 +1,5 @@
 /* An interface to write that retries after interrupts.
-   Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/safe-write.h b/gettext-tools/gnulib-lib/safe-write.h
index 86a32b2..65fa425 100644
--- a/gettext-tools/gnulib-lib/safe-write.h
+++ b/gettext-tools/gnulib-lib/safe-write.h
@@ -1,5 +1,5 @@
 /* An interface to write() that retries after interrupts.
-   Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/sched.in.h b/gettext-tools/gnulib-lib/sched.in.h
index 92d6a4f..1c0fe59 100644
--- a/gettext-tools/gnulib-lib/sched.in.h
+++ b/gettext-tools/gnulib-lib/sched.in.h
@@ -1,5 +1,5 @@
 /* Replacement <sched.h> for platforms that lack it.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/secure_getenv.c b/gettext-tools/gnulib-lib/secure_getenv.c
index 31aad1f..f359ab2 100644
--- a/gettext-tools/gnulib-lib/secure_getenv.c
+++ b/gettext-tools/gnulib-lib/secure_getenv.c
@@ -1,6 +1,6 @@
 /* Look up an environment variable more securely.
 
-   Copyright 2013-2015 Free Software Foundation, Inc.
+   Copyright 2013-2016 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
diff --git a/gettext-tools/gnulib-lib/set-acl.c b/gettext-tools/gnulib-lib/set-acl.c
index da31750..fbb5c16 100644
--- a/gettext-tools/gnulib-lib/set-acl.c
+++ b/gettext-tools/gnulib-lib/set-acl.c
@@ -1,6 +1,6 @@
 /* set-acl.c - set access control list equivalent to a mode
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/set-permissions.c b/gettext-tools/gnulib-lib/set-permissions.c
index 8e6ecf3..2c77356 100644
--- a/gettext-tools/gnulib-lib/set-permissions.c
+++ b/gettext-tools/gnulib-lib/set-permissions.c
@@ -1,6 +1,6 @@
 /* Set permissions of a file.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
@@ -269,6 +269,7 @@ set_acls_from_mode (const char *name, int desc, mode_t mode, bool *must_chmod)
 	  }
 	return -1;
       }
+    return 0;
   }
 }
 
diff --git a/gettext-tools/gnulib-lib/setenv.c b/gettext-tools/gnulib-lib/setenv.c
index 6b16fd5..85c32cb 100644
--- a/gettext-tools/gnulib-lib/setenv.c
+++ b/gettext-tools/gnulib-lib/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/setlocale.c b/gettext-tools/gnulib-lib/setlocale.c
index ed68ce2..7d366ed 100644
--- a/gettext-tools/gnulib-lib/setlocale.c
+++ b/gettext-tools/gnulib-lib/setlocale.c
@@ -1,5 +1,5 @@
 /* Set the current locale.  -*- coding: utf-8 -*-
-   Copyright (C) 2009, 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011-2016 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
@@ -381,6 +381,7 @@ static const struct table_entry language_table[] =
     { "sq", "Albanian" },
     { "sr", "Serbian (Latin)" },
     { "sr@cyrillic", "SRB" }, /* Serbian (Cyrillic) */
+    { "sv", "Swedish" },
     { "sw", "Swahili" },
     { "syr", "Syriac" },
     { "ta", "Tamil" },
diff --git a/gettext-tools/gnulib-lib/sh-quote.c b/gettext-tools/gnulib-lib/sh-quote.c
index d684cef..43ce86a 100644
--- a/gettext-tools/gnulib-lib/sh-quote.c
+++ b/gettext-tools/gnulib-lib/sh-quote.c
@@ -1,5 +1,5 @@
 /* Shell quoting.
-   Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/sh-quote.h b/gettext-tools/gnulib-lib/sh-quote.h
index 48ade84..1708d95 100644
--- a/gettext-tools/gnulib-lib/sh-quote.h
+++ b/gettext-tools/gnulib-lib/sh-quote.h
@@ -1,5 +1,5 @@
 /* Shell quoting.
-   Copyright (C) 2001-2002, 2004, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2004, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/sig-handler.h b/gettext-tools/gnulib-lib/sig-handler.h
index c814ed6..ad8c1dd 100644
--- a/gettext-tools/gnulib-lib/sig-handler.h
+++ b/gettext-tools/gnulib-lib/sig-handler.h
@@ -1,6 +1,6 @@
 /* Convenience declarations when working with <signal.h>.
 
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/sigaction.c b/gettext-tools/gnulib-lib/sigaction.c
index 9b2a089..529b612 100644
--- a/gettext-tools/gnulib-lib/sigaction.c
+++ b/gettext-tools/gnulib-lib/sigaction.c
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/signal.in.h b/gettext-tools/gnulib-lib/signal.in.h
index 265b72a..ab0a049 100644
--- a/gettext-tools/gnulib-lib/signal.in.h
+++ b/gettext-tools/gnulib-lib/signal.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <signal.h>.
 
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-tools/gnulib-lib/signbitd.c b/gettext-tools/gnulib-lib/signbitd.c
index 289b477..2de7ee6 100644
--- a/gettext-tools/gnulib-lib/signbitd.c
+++ b/gettext-tools/gnulib-lib/signbitd.c
@@ -1,5 +1,5 @@
 /* signbit() macro: Determine the sign bit of a floating-point number.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/signbitf.c b/gettext-tools/gnulib-lib/signbitf.c
index d771fcc..e185971 100644
--- a/gettext-tools/gnulib-lib/signbitf.c
+++ b/gettext-tools/gnulib-lib/signbitf.c
@@ -1,5 +1,5 @@
 /* signbit() macro: Determine the sign bit of a floating-point number.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/signbitl.c b/gettext-tools/gnulib-lib/signbitl.c
index 404304e..7dc0908 100644
--- a/gettext-tools/gnulib-lib/signbitl.c
+++ b/gettext-tools/gnulib-lib/signbitl.c
@@ -1,5 +1,5 @@
 /* signbit() macro: Determine the sign bit of a floating-point number.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/sigprocmask.c b/gettext-tools/gnulib-lib/sigprocmask.c
index e29b012..fcbf032 100644
--- a/gettext-tools/gnulib-lib/sigprocmask.c
+++ b/gettext-tools/gnulib-lib/sigprocmask.c
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/size_max.h b/gettext-tools/gnulib-lib/size_max.h
index 5a0568e..2f2792c 100644
--- a/gettext-tools/gnulib-lib/size_max.h
+++ b/gettext-tools/gnulib-lib/size_max.h
@@ -1,5 +1,5 @@
 /* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/snprintf.c b/gettext-tools/gnulib-lib/snprintf.c
index 11500ca..7cd89af 100644
--- a/gettext-tools/gnulib-lib/snprintf.c
+++ b/gettext-tools/gnulib-lib/snprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2016 Free Software Foundation, Inc.
    Written by Simon Josefsson and Paul Eggert.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawn-pipe.c b/gettext-tools/gnulib-lib/spawn-pipe.c
index a87844e..006fa8b 100644
--- a/gettext-tools/gnulib-lib/spawn-pipe.c
+++ b/gettext-tools/gnulib-lib/spawn-pipe.c
@@ -1,5 +1,5 @@
 /* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,8 @@
 
 #define _(str) gettext (str)
 
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if (((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+     || defined __KLIBC__)
 
 /* Native Windows API.  */
 # include <process.h>
@@ -116,7 +117,8 @@ create_pipe (const char *progname,
              bool slave_process, bool exit_on_error,
              int fd[2])
 {
-#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+#if (((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+     || defined __KLIBC__)
 
   /* Native Windows API.
      This uses _pipe(), dup2(), and spawnv().  It could also be implemented
diff --git a/gettext-tools/gnulib-lib/spawn-pipe.h b/gettext-tools/gnulib-lib/spawn-pipe.h
index 569c768..96e7beb 100644
--- a/gettext-tools/gnulib-lib/spawn-pipe.h
+++ b/gettext-tools/gnulib-lib/spawn-pipe.h
@@ -1,5 +1,5 @@
 /* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2003, 2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawn.in.h b/gettext-tools/gnulib-lib/spawn.in.h
index aa8222a..2f55098 100644
--- a/gettext-tools/gnulib-lib/spawn.in.h
+++ b/gettext-tools/gnulib-lib/spawn.in.h
@@ -1,5 +1,5 @@
 /* Definitions for POSIX spawn interface.
-   Copyright (C) 2000, 2003-2004, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2003-2004, 2008-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawn_faction_addclose.c b/gettext-tools/gnulib-lib/spawn_faction_addclose.c
index ee833d6..05449f3 100644
--- a/gettext-tools/gnulib-lib/spawn_faction_addclose.c
+++ b/gettext-tools/gnulib-lib/spawn_faction_addclose.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawn_faction_adddup2.c b/gettext-tools/gnulib-lib/spawn_faction_adddup2.c
index 3687448..a2b325e 100644
--- a/gettext-tools/gnulib-lib/spawn_faction_adddup2.c
+++ b/gettext-tools/gnulib-lib/spawn_faction_adddup2.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawn_faction_addopen.c b/gettext-tools/gnulib-lib/spawn_faction_addopen.c
index 4ecfd83..a29dd71 100644
--- a/gettext-tools/gnulib-lib/spawn_faction_addopen.c
+++ b/gettext-tools/gnulib-lib/spawn_faction_addopen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawn_faction_destroy.c b/gettext-tools/gnulib-lib/spawn_faction_destroy.c
index c639478..642beb3 100644
--- a/gettext-tools/gnulib-lib/spawn_faction_destroy.c
+++ b/gettext-tools/gnulib-lib/spawn_faction_destroy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawn_faction_init.c b/gettext-tools/gnulib-lib/spawn_faction_init.c
index c276913..a60dd8c 100644
--- a/gettext-tools/gnulib-lib/spawn_faction_init.c
+++ b/gettext-tools/gnulib-lib/spawn_faction_init.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawn_int.h b/gettext-tools/gnulib-lib/spawn_int.h
index 002d139..bf73566 100644
--- a/gettext-tools/gnulib-lib/spawn_int.h
+++ b/gettext-tools/gnulib-lib/spawn_int.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2008-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2008-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawnattr_destroy.c b/gettext-tools/gnulib-lib/spawnattr_destroy.c
index 50c8549..f7e84a0 100644
--- a/gettext-tools/gnulib-lib/spawnattr_destroy.c
+++ b/gettext-tools/gnulib-lib/spawnattr_destroy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawnattr_init.c b/gettext-tools/gnulib-lib/spawnattr_init.c
index 3e5dcdb..668a26a 100644
--- a/gettext-tools/gnulib-lib/spawnattr_init.c
+++ b/gettext-tools/gnulib-lib/spawnattr_init.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawnattr_setflags.c b/gettext-tools/gnulib-lib/spawnattr_setflags.c
index 0366575..97e4166 100644
--- a/gettext-tools/gnulib-lib/spawnattr_setflags.c
+++ b/gettext-tools/gnulib-lib/spawnattr_setflags.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2004, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2004, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawnattr_setsigmask.c b/gettext-tools/gnulib-lib/spawnattr_setsigmask.c
index 7831603..d9c6bd7 100644
--- a/gettext-tools/gnulib-lib/spawnattr_setsigmask.c
+++ b/gettext-tools/gnulib-lib/spawnattr_setsigmask.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawni.c b/gettext-tools/gnulib-lib/spawni.c
index 9b1b0b9..3451aa5 100644
--- a/gettext-tools/gnulib-lib/spawni.c
+++ b/gettext-tools/gnulib-lib/spawni.c
@@ -1,5 +1,5 @@
 /* Guts of POSIX spawn interface.  Generic POSIX.1 version.
-   Copyright (C) 2000-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/spawnp.c b/gettext-tools/gnulib-lib/spawnp.c
index 6d27e49..68cabf2 100644
--- a/gettext-tools/gnulib-lib/spawnp.c
+++ b/gettext-tools/gnulib-lib/spawnp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/stat.c b/gettext-tools/gnulib-lib/stat.c
index 2209826..62e9e0b 100644
--- a/gettext-tools/gnulib-lib/stat.c
+++ b/gettext-tools/gnulib-lib/stat.c
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/stdarg.in.h b/gettext-tools/gnulib-lib/stdarg.in.h
index 5239f51..63371e2 100644
--- a/gettext-tools/gnulib-lib/stdarg.in.h
+++ b/gettext-tools/gnulib-lib/stdarg.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <stdarg.h>.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/stdbool.in.h b/gettext-tools/gnulib-lib/stdbool.in.h
index 64a1761..7ecf203 100644
--- a/gettext-tools/gnulib-lib/stdbool.in.h
+++ b/gettext-tools/gnulib-lib/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/stddef.in.h b/gettext-tools/gnulib-lib/stddef.in.h
index 698307b..f4c4a10 100644
--- a/gettext-tools/gnulib-lib/stddef.in.h
+++ b/gettext-tools/gnulib-lib/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
@@ -81,8 +81,10 @@
 # define wchar_t int
 #endif
 
-/* Some platforms lack max_align_t.  */
-#if !@HAVE_MAX_ALIGN_T@
+/* Some platforms lack max_align_t.  The check for _GCC_MAX_ALIGN_T is
+   a hack in case the configure-time test was done with g++ even though
+   we are currently compiling with gcc.  */
+#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)
 /* On the x86, the maximum storage alignment of double, long, etc. is 4,
    but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
    and the C11 standard allows this.  Work around this problem by
diff --git a/gettext-tools/gnulib-lib/stdint.in.h b/gettext-tools/gnulib-lib/stdint.in.h
index 378de2e..cf65ec6 100644
--- a/gettext-tools/gnulib-lib/stdint.in.h
+++ b/gettext-tools/gnulib-lib/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2016 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -118,15 +118,10 @@
    picky compilers.  */
 
 #define _STDINT_MIN(signed, bits, zero) \
-  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
+  ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero))
 
 #define _STDINT_MAX(signed, bits, zero) \
-  ((signed) \
-   ? ~ _STDINT_MIN (signed, bits, zero) \
-   : /* The expression for the unsigned case.  The subtraction of (signed) \
-        is a nop in the unsigned case and avoids "signed integer overflow" \
-        warnings in the signed case.  */ \
-     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+  (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
 
 #if !GNULIB_defined_stdint_types
 
@@ -288,12 +283,17 @@ typedef gl_uint_fast32_t gl_uint_fast16_t;
 
 /* 7.18.1.4. Integer types capable of holding object pointers */
 
+/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
+   definitions of intptr_t and uintptr_t (which use int and unsigned)
+   to avoid clashes with declarations of system functions like sbrk.  */
+#ifndef _INTPTR_T_DECLARED
 #undef intptr_t
 #undef uintptr_t
 typedef long int gl_intptr_t;
 typedef unsigned long int gl_uintptr_t;
 #define intptr_t gl_intptr_t
 #define uintptr_t gl_uintptr_t
+#endif
 
 /* 7.18.1.5. Greatest-width integer types */
 
diff --git a/gettext-tools/gnulib-lib/stdio-write.c b/gettext-tools/gnulib-lib/stdio-write.c
index b913101..072e55b 100644
--- a/gettext-tools/gnulib-lib/stdio-write.c
+++ b/gettext-tools/gnulib-lib/stdio-write.c
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream write function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/stdio.in.h b/gettext-tools/gnulib-lib/stdio.in.h
index ec43874..9b31365 100644
--- a/gettext-tools/gnulib-lib/stdio.in.h
+++ b/gettext-tools/gnulib-lib/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/stdlib.in.h b/gettext-tools/gnulib-lib/stdlib.in.h
index 428a119..70dc88d 100644
--- a/gettext-tools/gnulib-lib/stdlib.in.h
+++ b/gettext-tools/gnulib-lib/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2016 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
diff --git a/gettext-tools/gnulib-lib/stpcpy.c b/gettext-tools/gnulib-lib/stpcpy.c
index 559d2f2..ec3996e 100644
--- a/gettext-tools/gnulib-lib/stpcpy.c
+++ b/gettext-tools/gnulib-lib/stpcpy.c
@@ -1,5 +1,5 @@
 /* stpcpy.c -- copy a string and return pointer to end of new string
-   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2015 Free Software
+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-tools/gnulib-lib/stpncpy.c b/gettext-tools/gnulib-lib/stpncpy.c
index e72ea47..89d6321 100644
--- a/gettext-tools/gnulib-lib/stpncpy.c
+++ b/gettext-tools/gnulib-lib/stpncpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2015 Free Software
+/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2016 Free Software
  * Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-tools/gnulib-lib/str-kmp.h b/gettext-tools/gnulib-lib/str-kmp.h
index 66fcead..fcb2813 100644
--- a/gettext-tools/gnulib-lib/str-kmp.h
+++ b/gettext-tools/gnulib-lib/str-kmp.h
@@ -1,6 +1,6 @@
 /* Substring search in a NUL terminated string of UNIT elements,
    using the Knuth-Morris-Pratt algorithm.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/str-two-way.h b/gettext-tools/gnulib-lib/str-two-way.h
index 6e10c8e..0fe3161 100644
--- a/gettext-tools/gnulib-lib/str-two-way.h
+++ b/gettext-tools/gnulib-lib/str-two-way.h
@@ -1,5 +1,5 @@
 /* Byte-wise substring search, using the Two-Way algorithm.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
diff --git a/gettext-tools/gnulib-lib/strchrnul.c b/gettext-tools/gnulib-lib/strchrnul.c
index 1000e83..1482a77 100644
--- a/gettext-tools/gnulib-lib/strchrnul.c
+++ b/gettext-tools/gnulib-lib/strchrnul.c
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/strcspn.c b/gettext-tools/gnulib-lib/strcspn.c
index 73bc5d0..0cd2dc7 100644
--- a/gettext-tools/gnulib-lib/strcspn.c
+++ b/gettext-tools/gnulib-lib/strcspn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006, 2009-2015 Free
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006, 2009-2016 Free
  * Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-tools/gnulib-lib/streq.h b/gettext-tools/gnulib-lib/streq.h
index 6107fc6..234f075 100644
--- a/gettext-tools/gnulib-lib/streq.h
+++ b/gettext-tools/gnulib-lib/streq.h
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/strerror-override.c b/gettext-tools/gnulib-lib/strerror-override.c
index 2bb4d74..9bc9b18 100644
--- a/gettext-tools/gnulib-lib/strerror-override.c
+++ b/gettext-tools/gnulib-lib/strerror-override.c
@@ -1,6 +1,6 @@
 /* strerror-override.c --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-lib/strerror-override.h b/gettext-tools/gnulib-lib/strerror-override.h
index 7af36df..5264fd5 100644
--- a/gettext-tools/gnulib-lib/strerror-override.h
+++ b/gettext-tools/gnulib-lib/strerror-override.h
@@ -1,6 +1,6 @@
 /* strerror-override.h --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-lib/strerror.c b/gettext-tools/gnulib-lib/strerror.c
index adba738..45c7633 100644
--- a/gettext-tools/gnulib-lib/strerror.c
+++ b/gettext-tools/gnulib-lib/strerror.c
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/striconv.c b/gettext-tools/gnulib-lib/striconv.c
index 6f7dad8..0d9ccdc 100644
--- a/gettext-tools/gnulib-lib/striconv.c
+++ b/gettext-tools/gnulib-lib/striconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2010-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/striconv.h b/gettext-tools/gnulib-lib/striconv.h
index 33cc212..e5217d7 100644
--- a/gettext-tools/gnulib-lib/striconv.h
+++ b/gettext-tools/gnulib-lib/striconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/striconveh.c b/gettext-tools/gnulib-lib/striconveh.c
index 2a9a8f7..bc5608f 100644
--- a/gettext-tools/gnulib-lib/striconveh.c
+++ b/gettext-tools/gnulib-lib/striconveh.c
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling.
-   Copyright (C) 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/striconveh.h b/gettext-tools/gnulib-lib/striconveh.h
index 1e13af6..9e05d2f 100644
--- a/gettext-tools/gnulib-lib/striconveh.h
+++ b/gettext-tools/gnulib-lib/striconveh.h
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling.
-   Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/striconveha.c b/gettext-tools/gnulib-lib/striconveha.c
index 4fadc17..d97de1b 100644
--- a/gettext-tools/gnulib-lib/striconveha.c
+++ b/gettext-tools/gnulib-lib/striconveha.c
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/striconveha.h b/gettext-tools/gnulib-lib/striconveha.h
index a5b8824..73d1c9a 100644
--- a/gettext-tools/gnulib-lib/striconveha.h
+++ b/gettext-tools/gnulib-lib/striconveha.h
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/string.in.h b/gettext-tools/gnulib-lib/string.in.h
index 2abd6bc..7fb00c1 100644
--- a/gettext-tools/gnulib-lib/string.in.h
+++ b/gettext-tools/gnulib-lib/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2016 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
diff --git a/gettext-tools/gnulib-lib/strnlen.c b/gettext-tools/gnulib-lib/strnlen.c
index 79e250c..1bd7936 100644
--- a/gettext-tools/gnulib-lib/strnlen.c
+++ b/gettext-tools/gnulib-lib/strnlen.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/strnlen1.c b/gettext-tools/gnulib-lib/strnlen1.c
index 48272a8..f5e0ffc 100644
--- a/gettext-tools/gnulib-lib/strnlen1.c
+++ b/gettext-tools/gnulib-lib/strnlen1.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/strnlen1.h b/gettext-tools/gnulib-lib/strnlen1.h
index 794e436..d3cd7c1 100644
--- a/gettext-tools/gnulib-lib/strnlen1.h
+++ b/gettext-tools/gnulib-lib/strnlen1.h
@@ -1,5 +1,5 @@
 /* Find the length of STRING + 1, but scan at most MAXLEN bytes.
-   Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/strpbrk.c b/gettext-tools/gnulib-lib/strpbrk.c
index 0e360f9..0562544 100644
--- a/gettext-tools/gnulib-lib/strpbrk.c
+++ b/gettext-tools/gnulib-lib/strpbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2015 Free Software
+/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-tools/gnulib-lib/strstr.c b/gettext-tools/gnulib-lib/strstr.c
index fbc11a2..60cd3e3 100644
--- a/gettext-tools/gnulib-lib/strstr.c
+++ b/gettext-tools/gnulib-lib/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2015 Free Software
+/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/gnulib-lib/strtol.c b/gettext-tools/gnulib-lib/strtol.c
index 1bc1439..6ef8a96 100644
--- a/gettext-tools/gnulib-lib/strtol.c
+++ b/gettext-tools/gnulib-lib/strtol.c
@@ -1,6 +1,6 @@
 /* Convert string representation of a number into an integer value.
 
-   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2015 Free Software
+   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
@@ -121,30 +121,19 @@
 /* The extra casts in the following macros work around compiler bugs,
    e.g., in Cray C 5.0.3.0.  */
 
-/* True if negative values of the signed integer type T use two's
-   complement, ones' complement, or signed magnitude representation,
-   respectively.  Much GNU code assumes two's complement, but some
-   people like to be portable to all possible C hosts.  */
-# define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-# define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-# define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
 /* True if the arithmetic type T is signed.  */
 # define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
-/* The maximum and minimum values for the integer type T.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
-# define TYPE_MINIMUM(t) \
-   ((t) (! TYPE_SIGNED (t) \
-         ? (t) 0 \
-         : TYPE_SIGNED_MAGNITUDE (t) \
-         ? ~ (t) 0 \
-         : ~ TYPE_MAXIMUM (t)))
-# define TYPE_MAXIMUM(t) \
-   ((t) (! TYPE_SIGNED (t) \
-         ? (t) -1 \
+/* Minimum and maximum values for integer types.
+   These macros have undefined behavior for signed types that either
+   have padding bits or do not use two's complement.  If this is a
+   problem for you, please let us know how to fix it for your host.  */
+
+/* The maximum and minimum values for the integer type T.  */
+# define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+# define TYPE_MAXIMUM(t)                                                 \
+   ((t) (! TYPE_SIGNED (t)                                               \
+         ? (t) -1                                                        \
          : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
 
 # ifndef ULLONG_MAX
diff --git a/gettext-tools/gnulib-lib/strtoul.c b/gettext-tools/gnulib-lib/strtoul.c
index 2051777..6a5d4dd 100644
--- a/gettext-tools/gnulib-lib/strtoul.c
+++ b/gettext-tools/gnulib-lib/strtoul.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2009-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/styled-ostream.c b/gettext-tools/gnulib-lib/styled-ostream.c
index 43b2699..8a967a8 100644
--- a/gettext-tools/gnulib-lib/styled-ostream.c
+++ b/gettext-tools/gnulib-lib/styled-ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "styled-ostream.oo.c"
 /* Abstract output stream for CSS styled text.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/styled-ostream.h b/gettext-tools/gnulib-lib/styled-ostream.h
index 3fbc60f..3a2dc6d 100644
--- a/gettext-tools/gnulib-lib/styled-ostream.h
+++ b/gettext-tools/gnulib-lib/styled-ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "styled-ostream.oo.h"
 /* Abstract output stream for CSS styled text.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/styled-ostream.oo.c b/gettext-tools/gnulib-lib/styled-ostream.oo.c
index 03ecbc0..f8522c7 100644
--- a/gettext-tools/gnulib-lib/styled-ostream.oo.c
+++ b/gettext-tools/gnulib-lib/styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Abstract output stream for CSS styled text.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/styled-ostream.oo.h b/gettext-tools/gnulib-lib/styled-ostream.oo.h
index 4e9c8d0..b3c8980 100644
--- a/gettext-tools/gnulib-lib/styled-ostream.oo.h
+++ b/gettext-tools/gnulib-lib/styled-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Abstract output stream for CSS styled text.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/sys_select.in.h b/gettext-tools/gnulib-lib/sys_select.in.h
index fd7a291..9a2622f 100644
--- a/gettext-tools/gnulib-lib/sys_select.in.h
+++ b/gettext-tools/gnulib-lib/sys_select.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <sys/select.h>.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
@@ -81,8 +81,9 @@
    of 'struct timeval', and no definition of this type.
    Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
    in <sys/time.h>.
-   But avoid namespace pollution on glibc systems.  */
-# ifndef __GLIBC__
+   But avoid namespace pollution on glibc systems and "unknown type
+   name" problems on Cygwin.  */
+# if !(defined __GLIBC__ || defined __CYGWIN__)
 #  include <sys/time.h>
 # endif
 
@@ -100,10 +101,11 @@
 #endif
 
 /* Get definition of 'sigset_t'.
-   But avoid namespace pollution on glibc systems.
+   But avoid namespace pollution on glibc systems and "unknown type
+   name" problems on Cygwin.
    Do this after the include_next (for the sake of OpenBSD 5.0) but before
    the split double-inclusion guard (for the sake of Solaris).  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__)
 # include <signal.h>
 #endif
 
@@ -289,12 +291,15 @@ _GL_WARN_ON_USE (pselect, "pselect is not portable - "
 #   define select rpl_select
 #  endif
 _GL_FUNCDECL_RPL (select, int,
-                  (int, fd_set *, fd_set *, fd_set *, struct timeval *));
+                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
+                   struct timeval *restrict));
 _GL_CXXALIAS_RPL (select, int,
-                  (int, fd_set *, fd_set *, fd_set *, struct timeval *));
+                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
+                   struct timeval *restrict));
 # else
 _GL_CXXALIAS_SYS (select, int,
-                  (int, fd_set *, fd_set *, fd_set *, struct timeval *));
+                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
+                   struct timeval *restrict));
 # endif
 _GL_CXXALIASWARN (select);
 #elif @HAVE_WINSOCK2_H@
diff --git a/gettext-tools/gnulib-lib/sys_stat.in.h b/gettext-tools/gnulib-lib/sys_stat.in.h
index 9f5e853..72d9537 100644
--- a/gettext-tools/gnulib-lib/sys_stat.in.h
+++ b/gettext-tools/gnulib-lib/sys_stat.in.h
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/sys_time.in.h b/gettext-tools/gnulib-lib/sys_time.in.h
index c556c5d..1623a1d 100644
--- a/gettext-tools/gnulib-lib/sys_time.in.h
+++ b/gettext-tools/gnulib-lib/sys_time.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/time.h.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/sys_types.in.h b/gettext-tools/gnulib-lib/sys_types.in.h
index 814bc17..8ab0545 100644
--- a/gettext-tools/gnulib-lib/sys_types.in.h
+++ b/gettext-tools/gnulib-lib/sys_types.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/types.h.
 
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-lib/sys_wait.in.h b/gettext-tools/gnulib-lib/sys_wait.in.h
index 87d2282..3982b2b 100644
--- a/gettext-tools/gnulib-lib/sys_wait.in.h
+++ b/gettext-tools/gnulib-lib/sys_wait.in.h
@@ -1,5 +1,5 @@
 /* A POSIX-like <sys/wait.h>.
-   Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/tempname.c b/gettext-tools/gnulib-lib/tempname.c
index 69c572f..b1e9880 100644
--- a/gettext-tools/gnulib-lib/tempname.c
+++ b/gettext-tools/gnulib-lib/tempname.c
@@ -1,6 +1,6 @@
 /* tempname.c - generate the name of a temporary file.
 
-   Copyright (C) 1991-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1991-2003, 2005-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/tempname.h b/gettext-tools/gnulib-lib/tempname.h
index e609360..be01c51 100644
--- a/gettext-tools/gnulib-lib/tempname.h
+++ b/gettext-tools/gnulib-lib/tempname.h
@@ -1,6 +1,6 @@
 /* Create a temporary file or directory.
 
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/term-ostream.c b/gettext-tools/gnulib-lib/term-ostream.c
index a8d5d48..4a03686 100644
--- a/gettext-tools/gnulib-lib/term-ostream.c
+++ b/gettext-tools/gnulib-lib/term-ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "term-ostream.oo.c"
 /* Output stream for attributed text, producing ANSI escape sequences.
-   Copyright (C) 2006-2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/term-ostream.h b/gettext-tools/gnulib-lib/term-ostream.h
index 1e697f2..f5ab2c6 100644
--- a/gettext-tools/gnulib-lib/term-ostream.h
+++ b/gettext-tools/gnulib-lib/term-ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "term-ostream.oo.h"
 /* Output stream for attributed text, producing ANSI escape sequences.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/term-ostream.oo.c b/gettext-tools/gnulib-lib/term-ostream.oo.c
index 243619a..165fc33 100644
--- a/gettext-tools/gnulib-lib/term-ostream.oo.c
+++ b/gettext-tools/gnulib-lib/term-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for attributed text, producing ANSI escape sequences.
-   Copyright (C) 2006-2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/term-ostream.oo.h b/gettext-tools/gnulib-lib/term-ostream.oo.h
index 8883b8f..e3e1498 100644
--- a/gettext-tools/gnulib-lib/term-ostream.oo.h
+++ b/gettext-tools/gnulib-lib/term-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream for attributed text, producing ANSI escape sequences.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/term-styled-ostream.c b/gettext-tools/gnulib-lib/term-styled-ostream.c
index 001197a..35dbd6a 100644
--- a/gettext-tools/gnulib-lib/term-styled-ostream.c
+++ b/gettext-tools/gnulib-lib/term-styled-ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "term-styled-ostream.oo.c"
 /* Output stream for CSS styled text, producing ANSI escape sequences.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/term-styled-ostream.h b/gettext-tools/gnulib-lib/term-styled-ostream.h
index e841f2c..d108883 100644
--- a/gettext-tools/gnulib-lib/term-styled-ostream.h
+++ b/gettext-tools/gnulib-lib/term-styled-ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "term-styled-ostream.oo.h"
 /* Output stream for CSS styled text, producing ANSI escape sequences.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/term-styled-ostream.oo.c b/gettext-tools/gnulib-lib/term-styled-ostream.oo.c
index 658574b..81a4074 100644
--- a/gettext-tools/gnulib-lib/term-styled-ostream.oo.c
+++ b/gettext-tools/gnulib-lib/term-styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing ANSI escape sequences.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/term-styled-ostream.oo.h b/gettext-tools/gnulib-lib/term-styled-ostream.oo.h
index 05335ce..f9f84fd 100644
--- a/gettext-tools/gnulib-lib/term-styled-ostream.oo.h
+++ b/gettext-tools/gnulib-lib/term-styled-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing ANSI escape sequences.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/terminfo.h b/gettext-tools/gnulib-lib/terminfo.h
index 6e412f0..da973fd 100644
--- a/gettext-tools/gnulib-lib/terminfo.h
+++ b/gettext-tools/gnulib-lib/terminfo.h
@@ -1,5 +1,5 @@
 /* Information about terminal capabilities.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/time.in.h b/gettext-tools/gnulib-lib/time.in.h
index a90552c..865c114 100644
--- a/gettext-tools/gnulib-lib/time.in.h
+++ b/gettext-tools/gnulib-lib/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/tmpdir.c b/gettext-tools/gnulib-lib/tmpdir.c
index ce39f21..1cc01fb 100644
--- a/gettext-tools/gnulib-lib/tmpdir.c
+++ b/gettext-tools/gnulib-lib/tmpdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001-2002, 2006, 2009-2015 Free Software Foundation,
+/* Copyright (C) 1999, 2001-2002, 2006, 2009-2016 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/gnulib-lib/tmpdir.h b/gettext-tools/gnulib-lib/tmpdir.h
index d425bf4..ef615fc 100644
--- a/gettext-tools/gnulib-lib/tmpdir.h
+++ b/gettext-tools/gnulib-lib/tmpdir.h
@@ -1,5 +1,5 @@
 /* Determine a temporary directory.
-   Copyright (C) 2001-2002, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/tparm.c b/gettext-tools/gnulib-lib/tparm.c
index 3cc7b8d..ee73726 100644
--- a/gettext-tools/gnulib-lib/tparm.c
+++ b/gettext-tools/gnulib-lib/tparm.c
@@ -1,5 +1,5 @@
 /* Substitution of parameters in strings from terminal descriptions.
-   Copyright (C) 2006, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2012, 2015-2016 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
diff --git a/gettext-tools/gnulib-lib/tputs.c b/gettext-tools/gnulib-lib/tputs.c
index c7d226f..79b3772 100644
--- a/gettext-tools/gnulib-lib/tputs.c
+++ b/gettext-tools/gnulib-lib/tputs.c
@@ -1,5 +1,5 @@
 /* Output of string from terminal descriptions.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 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
diff --git a/gettext-tools/gnulib-lib/trim.c b/gettext-tools/gnulib-lib/trim.c
index 369b20f..6f681a7 100644
--- a/gettext-tools/gnulib-lib/trim.c
+++ b/gettext-tools/gnulib-lib/trim.c
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-tools/gnulib-lib/trim.h b/gettext-tools/gnulib-lib/trim.h
index 8a38a9f..01c22f2 100644
--- a/gettext-tools/gnulib-lib/trim.h
+++ b/gettext-tools/gnulib-lib/trim.h
@@ -1,5 +1,5 @@
 /* Removes leading and/or trailing whitespaces
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/uniconv.in.h b/gettext-tools/gnulib-lib/uniconv.in.h
index bca94ba..7c3b0c3 100644
--- a/gettext-tools/gnulib-lib/uniconv.in.h
+++ b/gettext-tools/gnulib-lib/uniconv.in.h
@@ -1,5 +1,5 @@
 /* Conversions between Unicode and legacy encodings.
-   Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/uniconv/u8-conv-from-enc.c b/gettext-tools/gnulib-lib/uniconv/u8-conv-from-enc.c
index 3fdc8ca..a75001d 100644
--- a/gettext-tools/gnulib-lib/uniconv/u8-conv-from-enc.c
+++ b/gettext-tools/gnulib-lib/uniconv/u8-conv-from-enc.c
@@ -1,5 +1,5 @@
 /* Conversion to UTF-8 from legacy encodings.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/unictype.in.h b/gettext-tools/gnulib-lib/unictype.in.h
index fdbfdd3..72b5f96 100644
--- a/gettext-tools/gnulib-lib/unictype.in.h
+++ b/gettext-tools/gnulib-lib/unictype.in.h
@@ -1,5 +1,5 @@
 /* Unicode character classification and properties.
-   Copyright (C) 2002, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/unictype/bitmap.h b/gettext-tools/gnulib-lib/unictype/bitmap.h
index 19aea60..fa2f60e 100644
--- a/gettext-tools/gnulib-lib/unictype/bitmap.h
+++ b/gettext-tools/gnulib-lib/unictype/bitmap.h
@@ -1,5 +1,5 @@
 /* Three-level bitmap lookup.
-   Copyright (C) 2000-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2000-2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unictype/ctype_space.c b/gettext-tools/gnulib-lib/unictype/ctype_space.c
index 7bca2ac..81b349a 100644
--- a/gettext-tools/gnulib-lib/unictype/ctype_space.c
+++ b/gettext-tools/gnulib-lib/unictype/ctype_space.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unilbrk.in.h b/gettext-tools/gnulib-lib/unilbrk.in.h
index 0ff4556..da83e02 100644
--- a/gettext-tools/gnulib-lib/unilbrk.in.h
+++ b/gettext-tools/gnulib-lib/unilbrk.in.h
@@ -1,5 +1,5 @@
 /* Line breaking of Unicode strings.
-   Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unilbrk/lbrktables.c b/gettext-tools/gnulib-lib/unilbrk/lbrktables.c
index 81a77b4..44ca9ce 100644
--- a/gettext-tools/gnulib-lib/unilbrk/lbrktables.c
+++ b/gettext-tools/gnulib-lib/unilbrk/lbrktables.c
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary tables.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unilbrk/lbrktables.h b/gettext-tools/gnulib-lib/unilbrk/lbrktables.h
index 42599ae..08fb533 100644
--- a/gettext-tools/gnulib-lib/unilbrk/lbrktables.h
+++ b/gettext-tools/gnulib-lib/unilbrk/lbrktables.h
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary tables.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unilbrk/u8-possible-linebreaks.c b/gettext-tools/gnulib-lib/unilbrk/u8-possible-linebreaks.c
index e848a02..0e8ea6b 100644
--- a/gettext-tools/gnulib-lib/unilbrk/u8-possible-linebreaks.c
+++ b/gettext-tools/gnulib-lib/unilbrk/u8-possible-linebreaks.c
@@ -1,5 +1,5 @@
 /* Line breaking of UTF-8 strings.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unilbrk/u8-width-linebreaks.c b/gettext-tools/gnulib-lib/unilbrk/u8-width-linebreaks.c
index 1d95956..346fc52 100644
--- a/gettext-tools/gnulib-lib/unilbrk/u8-width-linebreaks.c
+++ b/gettext-tools/gnulib-lib/unilbrk/u8-width-linebreaks.c
@@ -1,5 +1,5 @@
 /* Line breaking of UTF-8 strings.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unilbrk/ulc-common.c b/gettext-tools/gnulib-lib/unilbrk/ulc-common.c
index 9fd2624..68704b3 100644
--- a/gettext-tools/gnulib-lib/unilbrk/ulc-common.c
+++ b/gettext-tools/gnulib-lib/unilbrk/ulc-common.c
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary functions.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unilbrk/ulc-common.h b/gettext-tools/gnulib-lib/unilbrk/ulc-common.h
index 661270d..2a98ba2 100644
--- a/gettext-tools/gnulib-lib/unilbrk/ulc-common.h
+++ b/gettext-tools/gnulib-lib/unilbrk/ulc-common.h
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary functions.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unilbrk/ulc-width-linebreaks.c b/gettext-tools/gnulib-lib/unilbrk/ulc-width-linebreaks.c
index 96f416e..4b1119d 100644
--- a/gettext-tools/gnulib-lib/unilbrk/ulc-width-linebreaks.c
+++ b/gettext-tools/gnulib-lib/unilbrk/ulc-width-linebreaks.c
@@ -1,5 +1,5 @@
 /* Line breaking of strings.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/uniname.in.h b/gettext-tools/gnulib-lib/uniname.in.h
index 082582c..8fd71e3 100644
--- a/gettext-tools/gnulib-lib/uniname.in.h
+++ b/gettext-tools/gnulib-lib/uniname.in.h
@@ -1,5 +1,5 @@
 /* Association between Unicode characters and their names.
-   Copyright (C) 2000-2002, 2005, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2000-2002, 2005, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/uniname/uniname.c b/gettext-tools/gnulib-lib/uniname/uniname.c
index 8f9f1b4..5da6ced 100644
--- a/gettext-tools/gnulib-lib/uniname/uniname.c
+++ b/gettext-tools/gnulib-lib/uniname/uniname.c
@@ -1,5 +1,5 @@
 /* Association between Unicode characters and their names.
-   Copyright (C) 2000-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2005-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/unistd--.h b/gettext-tools/gnulib-lib/unistd--.h
index ada1f6b..bd1d0fb 100644
--- a/gettext-tools/gnulib-lib/unistd--.h
+++ b/gettext-tools/gnulib-lib/unistd--.h
@@ -1,6 +1,6 @@
 /* Like unistd.h, but redefine some names to avoid glitches.
 
-   Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/unistd-safer.h b/gettext-tools/gnulib-lib/unistd-safer.h
index d4251b3..c8179ce 100644
--- a/gettext-tools/gnulib-lib/unistd-safer.h
+++ b/gettext-tools/gnulib-lib/unistd-safer.h
@@ -1,6 +1,6 @@
 /* Invoke unistd-like functions, but avoid some glitches.
 
-   Copyright (C) 2001, 2003, 2005, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/unistd.in.h b/gettext-tools/gnulib-lib/unistd.in.h
index 93f1ed9..a9ac097 100644
--- a/gettext-tools/gnulib-lib/unistd.in.h
+++ b/gettext-tools/gnulib-lib/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 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
diff --git a/gettext-tools/gnulib-lib/unistr.in.h b/gettext-tools/gnulib-lib/unistr.in.h
index be158be..70aa9cb 100644
--- a/gettext-tools/gnulib-lib/unistr.in.h
+++ b/gettext-tools/gnulib-lib/unistr.in.h
@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/unistr/u16-mbtouc-aux.c b/gettext-tools/gnulib-lib/unistr/u16-mbtouc-aux.c
index 2e8487d..5e88e04 100644
--- a/gettext-tools/gnulib-lib/unistr/u16-mbtouc-aux.c
+++ b/gettext-tools/gnulib-lib/unistr/u16-mbtouc-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UTF-16 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u16-mbtouc.c b/gettext-tools/gnulib-lib/unistr/u16-mbtouc.c
index 75a2521..00c1025 100644
--- a/gettext-tools/gnulib-lib/unistr/u16-mbtouc.c
+++ b/gettext-tools/gnulib-lib/unistr/u16-mbtouc.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-16 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u8-check.c b/gettext-tools/gnulib-lib/unistr/u8-check.c
index 9c4a75c..786ebb5 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-check.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-check.c
@@ -1,5 +1,5 @@
 /* Check UTF-8 string.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u8-mblen.c b/gettext-tools/gnulib-lib/unistr/u8-mblen.c
index 32d960c..88b4cef 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-mblen.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-mblen.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2015 Free Software
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
diff --git a/gettext-tools/gnulib-lib/unistr/u8-mbtouc-aux.c b/gettext-tools/gnulib-lib/unistr/u8-mbtouc-aux.c
index a751844..ca3c3ab 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-mbtouc-aux.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-mbtouc-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe-aux.c b/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe-aux.c
index ae46311..2073d18 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe-aux.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe.c b/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe.c
index e27dd69..04ed687 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-mbtouc-unsafe.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u8-mbtouc.c b/gettext-tools/gnulib-lib/unistr/u8-mbtouc.c
index 2e9aced..edae650 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-mbtouc.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-mbtouc.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u8-mbtoucr.c b/gettext-tools/gnulib-lib/unistr/u8-mbtoucr.c
index 9cc1500..48f9ca3 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-mbtoucr.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string, returning an error code.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u8-prev.c b/gettext-tools/gnulib-lib/unistr/u8-prev.c
index 20c8844..2fa94c9 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-prev.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-prev.c
@@ -1,5 +1,5 @@
 /* Iterate over previous character in UTF-8 string.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u8-uctomb-aux.c b/gettext-tools/gnulib-lib/unistr/u8-uctomb-aux.c
index 65445be..d5ff1d6 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-uctomb-aux.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-uctomb-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unistr/u8-uctomb.c b/gettext-tools/gnulib-lib/unistr/u8-uctomb.c
index a8250f4..419a6b4 100644
--- a/gettext-tools/gnulib-lib/unistr/u8-uctomb.c
+++ b/gettext-tools/gnulib-lib/unistr/u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unitypes.in.h b/gettext-tools/gnulib-lib/unitypes.in.h
index d3c47ae..c6ca0ba 100644
--- a/gettext-tools/gnulib-lib/unitypes.in.h
+++ b/gettext-tools/gnulib-lib/unitypes.in.h
@@ -1,5 +1,5 @@
 /* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/uniwidth.in.h b/gettext-tools/gnulib-lib/uniwidth.in.h
index 7694beb..0ab6d25 100644
--- a/gettext-tools/gnulib-lib/uniwidth.in.h
+++ b/gettext-tools/gnulib-lib/uniwidth.in.h
@@ -1,5 +1,5 @@
 /* Display width functions.
-   Copyright (C) 2001-2002, 2005, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/uniwidth/cjk.h b/gettext-tools/gnulib-lib/uniwidth/cjk.h
index cdd9a55..0eac6fe 100644
--- a/gettext-tools/gnulib-lib/uniwidth/cjk.h
+++ b/gettext-tools/gnulib-lib/uniwidth/cjk.h
@@ -1,5 +1,5 @@
 /* Test for CJK encoding.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/uniwidth/width.c b/gettext-tools/gnulib-lib/uniwidth/width.c
index c7e03b2..bd3b3fc 100644
--- a/gettext-tools/gnulib-lib/uniwidth/width.c
+++ b/gettext-tools/gnulib-lib/uniwidth/width.c
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-lib/unlocked-io.h b/gettext-tools/gnulib-lib/unlocked-io.h
index 06ffac6..c0ece50 100644
--- a/gettext-tools/gnulib-lib/unlocked-io.h
+++ b/gettext-tools/gnulib-lib/unlocked-io.h
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/unsetenv.c b/gettext-tools/gnulib-lib/unsetenv.c
index 87f41d5..8368744 100644
--- a/gettext-tools/gnulib-lib/unsetenv.c
+++ b/gettext-tools/gnulib-lib/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2015 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/vasnprintf.c b/gettext-tools/gnulib-lib/vasnprintf.c
index 88332f0..72bf3bc 100644
--- a/gettext-tools/gnulib-lib/vasnprintf.c
+++ b/gettext-tools/gnulib-lib/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2016 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
diff --git a/gettext-tools/gnulib-lib/vasnprintf.h b/gettext-tools/gnulib-lib/vasnprintf.h
index 3494eef..8e9d84f 100644
--- a/gettext-tools/gnulib-lib/vasnprintf.h
+++ b/gettext-tools/gnulib-lib/vasnprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2007-2016 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
diff --git a/gettext-tools/gnulib-lib/vasprintf.c b/gettext-tools/gnulib-lib/vasprintf.c
index 5dd4abd..a5dc1be 100644
--- a/gettext-tools/gnulib-lib/vasprintf.c
+++ b/gettext-tools/gnulib-lib/vasprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2016 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
diff --git a/gettext-tools/gnulib-lib/verify.h b/gettext-tools/gnulib-lib/verify.h
index 60eba49..2f43837 100644
--- a/gettext-tools/gnulib-lib/verify.h
+++ b/gettext-tools/gnulib-lib/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/vsnprintf.c b/gettext-tools/gnulib-lib/vsnprintf.c
index d2ebed9..4631b17 100644
--- a/gettext-tools/gnulib-lib/vsnprintf.c
+++ b/gettext-tools/gnulib-lib/vsnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2016 Free Software Foundation, Inc.
    Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/w32spawn.h b/gettext-tools/gnulib-lib/w32spawn.h
index 4a21a4e..389054a 100644
--- a/gettext-tools/gnulib-lib/w32spawn.h
+++ b/gettext-tools/gnulib-lib/w32spawn.h
@@ -1,5 +1,5 @@
 /* Auxiliary functions for the creation of subprocesses.  Native Windows API.
-   Copyright (C) 2001, 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -15,9 +15,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef __KLIBC__
 /* Get declarations of the native Windows API functions.  */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
 
 /* Get _open_osfhandle().  */
 #include <io.h>
@@ -123,8 +125,13 @@ undup_safer_noinherit (int tempfd, int origfd)
        - mingw programs that have a global variable 'int _CRT_glob = 0;',
        - Cygwin programs, when invoked from a Cygwin program.
  */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037*?"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#ifndef __KLIBC__
+# define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037*?"
+# define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#else
+# define SHELL_SPECIAL_CHARS ""
+# define SHELL_SPACE_CHARS ""
+#endif
 static char **
 prepare_spawn (char **argv)
 {
diff --git a/gettext-tools/gnulib-lib/wait-process.c b/gettext-tools/gnulib-lib/wait-process.c
index 5dd6f07..d081385 100644
--- a/gettext-tools/gnulib-lib/wait-process.c
+++ b/gettext-tools/gnulib-lib/wait-process.c
@@ -1,5 +1,5 @@
 /* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/wait-process.h b/gettext-tools/gnulib-lib/wait-process.h
index e453246..50dbb89 100644
--- a/gettext-tools/gnulib-lib/wait-process.h
+++ b/gettext-tools/gnulib-lib/wait-process.h
@@ -1,5 +1,5 @@
 /* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/waitpid.c b/gettext-tools/gnulib-lib/waitpid.c
index 46a5d92..162ade8 100644
--- a/gettext-tools/gnulib-lib/waitpid.c
+++ b/gettext-tools/gnulib-lib/waitpid.c
@@ -1,5 +1,5 @@
 /* Wait for process state change.
-   Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2016 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
diff --git a/gettext-tools/gnulib-lib/wchar.in.h b/gettext-tools/gnulib-lib/wchar.in.h
index 684299f..755600f 100644
--- a/gettext-tools/gnulib-lib/wchar.in.h
+++ b/gettext-tools/gnulib-lib/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
@@ -31,7 +31,7 @@
 @PRAGMA_COLUMNS@
 
 #if (((defined __need_mbstate_t || defined __need_wint_t)               \
-      && !defined __MINGW32__)                                          \
+      && !defined __MINGW32__ && !defined __KLIBC__)                    \
      || (defined __hpux                                                 \
          && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
              || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H))               \
@@ -445,6 +445,11 @@ _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
 #  if !@HAVE_DECL_WCWIDTH@
 /* wcwidth exists but is not declared.  */
 _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+#  elif defined __KLIBC__
+/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a
+   static inline function.  The implementation of wcwidth in wcwidth.c
+   causes a "conflicting types" error. */
+#   undef wcwidth
 #  endif
 _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
 # endif
diff --git a/gettext-tools/gnulib-lib/wctype.in.h b/gettext-tools/gnulib-lib/wctype.in.h
index 9050b7e..3431854 100644
--- a/gettext-tools/gnulib-lib/wctype.in.h
+++ b/gettext-tools/gnulib-lib/wctype.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-tools/gnulib-lib/wcwidth.c b/gettext-tools/gnulib-lib/wcwidth.c
index d2b7118..b94fad0 100644
--- a/gettext-tools/gnulib-lib/wcwidth.c
+++ b/gettext-tools/gnulib-lib/wcwidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a character.
-   Copyright (C) 2006-2007, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010-2016 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
diff --git a/gettext-tools/gnulib-lib/write.c b/gettext-tools/gnulib-lib/write.c
index ed2d3b7..8c048e7 100644
--- a/gettext-tools/gnulib-lib/write.c
+++ b/gettext-tools/gnulib-lib/write.c
@@ -1,5 +1,5 @@
 /* POSIX compatible write() function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xalloc.h b/gettext-tools/gnulib-lib/xalloc.h
index b261994..f4a329e 100644
--- a/gettext-tools/gnulib-lib/xalloc.h
+++ b/gettext-tools/gnulib-lib/xalloc.h
@@ -1,5 +1,5 @@
 /* malloc with out of memory checking.
-   Copyright (C) 2001-2004, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xasprintf.c b/gettext-tools/gnulib-lib/xasprintf.c
index f8eef97..e9e83ef 100644
--- a/gettext-tools/gnulib-lib/xasprintf.c
+++ b/gettext-tools/gnulib-lib/xasprintf.c
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006, 2009-2015 Free Software Foundation,
+   Copyright (C) 1999, 2002-2004, 2006, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xconcat-filename.c b/gettext-tools/gnulib-lib/xconcat-filename.c
index 10ebbea..7e4593e 100644
--- a/gettext-tools/gnulib-lib/xconcat-filename.c
+++ b/gettext-tools/gnulib-lib/xconcat-filename.c
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2016 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 the
diff --git a/gettext-tools/gnulib-lib/xerror.c b/gettext-tools/gnulib-lib/xerror.c
index 705b553..3c1e799 100644
--- a/gettext-tools/gnulib-lib/xerror.c
+++ b/gettext-tools/gnulib-lib/xerror.c
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xerror.h b/gettext-tools/gnulib-lib/xerror.h
index fc8b163..d702c3a 100644
--- a/gettext-tools/gnulib-lib/xerror.h
+++ b/gettext-tools/gnulib-lib/xerror.h
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xmalloc.c b/gettext-tools/gnulib-lib/xmalloc.c
index 43dcb94..9d435a5 100644
--- a/gettext-tools/gnulib-lib/xmalloc.c
+++ b/gettext-tools/gnulib-lib/xmalloc.c
@@ -1,6 +1,6 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015-2016 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
diff --git a/gettext-tools/gnulib-lib/xmalloca.c b/gettext-tools/gnulib-lib/xmalloca.c
index 4fc7c8a..bcbed77 100644
--- a/gettext-tools/gnulib-lib/xmalloca.c
+++ b/gettext-tools/gnulib-lib/xmalloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation with out of memory checking.
-   Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xmalloca.h b/gettext-tools/gnulib-lib/xmalloca.h
index c067c8a..f90fa9f 100644
--- a/gettext-tools/gnulib-lib/xmalloca.h
+++ b/gettext-tools/gnulib-lib/xmalloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation with out of memory checking.
-   Copyright (C) 2003, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xmemdup0.c b/gettext-tools/gnulib-lib/xmemdup0.c
new file mode 100644
index 0000000..577f5f5
--- /dev/null
+++ b/gettext-tools/gnulib-lib/xmemdup0.c
@@ -0,0 +1,44 @@
+/* xmemdup0.c -- copy a block of arbitrary bytes, plus a trailing NUL
+
+   Copyright (C) 2008-2016 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "xmemdup0.h"
+#include "xalloc.h"
+
+#include <string.h>
+
+/* Clone an arbitrary block of bytes P of size S, with error checking,
+   and include a terminating NUL byte.  P is of type 'void const *',
+   to make it easier to use this with other mem* functions that return
+   'void *', but since appending a NUL byte only makes sense on bytes,
+   the return type is 'char *'.
+
+   The terminating NUL makes it safe to use strlen or rawmemchr to
+   check for embedded NUL; it also speeds up algorithms such as escape
+   sequence processing on arbitrary memory, by making it always safe
+   to read the byte after the escape character rather than having to
+   check if each escape character is the last byte in the object.  */
+
+char *
+xmemdup0 (void const *p, size_t s)
+{
+  char *result = xcharalloc (s + 1);
+  memcpy (result, p, s);
+  result[s] = 0;
+  return result;
+}
diff --git a/gettext-tools/gnulib-lib/xmemdup0.h b/gettext-tools/gnulib-lib/xmemdup0.h
new file mode 100644
index 0000000..76c1dab
--- /dev/null
+++ b/gettext-tools/gnulib-lib/xmemdup0.h
@@ -0,0 +1,41 @@
+/* xmemdup0.h -- copy a block of arbitrary bytes, plus a trailing NUL
+
+   Copyright (C) 2008-2016 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef XMEMDUP_H_
+# define XMEMDUP_H_
+
+# include <stddef.h>
+
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* This function is always triggered when memory is exhausted.
+   It must be defined by the application, either explicitly
+   or by using gnulib's xalloc-die module.  This is the
+   function to call when one wants the program to die because of a
+   memory allocation failure.  */
+extern _Noreturn void xalloc_die (void);
+
+char *xmemdup0 (void const *p, size_t s);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* !XMEMDUP0_H_ */
diff --git a/gettext-tools/gnulib-lib/xreadlink.c b/gettext-tools/gnulib-lib/xreadlink.c
index 5082d0b..901f946 100644
--- a/gettext-tools/gnulib-lib/xreadlink.c
+++ b/gettext-tools/gnulib-lib/xreadlink.c
@@ -1,6 +1,6 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/xreadlink.h b/gettext-tools/gnulib-lib/xreadlink.h
index a970eb9..555c27d 100644
--- a/gettext-tools/gnulib-lib/xreadlink.h
+++ b/gettext-tools/gnulib-lib/xreadlink.h
@@ -1,6 +1,6 @@
 /* Reading symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xsetenv.c b/gettext-tools/gnulib-lib/xsetenv.c
index eb38d04..11c90fa 100644
--- a/gettext-tools/gnulib-lib/xsetenv.c
+++ b/gettext-tools/gnulib-lib/xsetenv.c
@@ -1,5 +1,5 @@
 /* Setting environment variables, with out-of-memory checking.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/xsetenv.h b/gettext-tools/gnulib-lib/xsetenv.h
index 7d9d67c..b3b7a6b 100644
--- a/gettext-tools/gnulib-lib/xsetenv.h
+++ b/gettext-tools/gnulib-lib/xsetenv.h
@@ -1,5 +1,5 @@
 /* Setting environment variables, with out-of-memory checking.
-   Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-lib/xsize.h b/gettext-tools/gnulib-lib/xsize.h
index b2a786a..202a87e 100644
--- a/gettext-tools/gnulib-lib/xsize.h
+++ b/gettext-tools/gnulib-lib/xsize.h
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008-2016 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
diff --git a/gettext-tools/gnulib-lib/xstrdup.c b/gettext-tools/gnulib-lib/xstrdup.c
index 7aa09dc..c7fbe14 100644
--- a/gettext-tools/gnulib-lib/xstrdup.c
+++ b/gettext-tools/gnulib-lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015 Free Software
+   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xstriconv.c b/gettext-tools/gnulib-lib/xstriconv.c
index d5e1951..2dbee18 100644
--- a/gettext-tools/gnulib-lib/xstriconv.c
+++ b/gettext-tools/gnulib-lib/xstriconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xstriconv.h b/gettext-tools/gnulib-lib/xstriconv.h
index 6319989..61e7c75 100644
--- a/gettext-tools/gnulib-lib/xstriconv.h
+++ b/gettext-tools/gnulib-lib/xstriconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xstriconveh.c b/gettext-tools/gnulib-lib/xstriconveh.c
index f47904a..c2c8521 100644
--- a/gettext-tools/gnulib-lib/xstriconveh.c
+++ b/gettext-tools/gnulib-lib/xstriconveh.c
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xstriconveh.h b/gettext-tools/gnulib-lib/xstriconveh.h
index 5438a75..53c7019 100644
--- a/gettext-tools/gnulib-lib/xstriconveh.h
+++ b/gettext-tools/gnulib-lib/xstriconveh.h
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-lib/xvasprintf.c b/gettext-tools/gnulib-lib/xvasprintf.c
index 441ab59..9deaad0 100644
--- a/gettext-tools/gnulib-lib/xvasprintf.c
+++ b/gettext-tools/gnulib-lib/xvasprintf.c
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2004, 2006-2016 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
diff --git a/gettext-tools/gnulib-lib/xvasprintf.h b/gettext-tools/gnulib-lib/xvasprintf.h
index 3b7f5ad..d62d7b7 100644
--- a/gettext-tools/gnulib-lib/xvasprintf.h
+++ b/gettext-tools/gnulib-lib/xvasprintf.h
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 2002-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2006-2016 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
diff --git a/gettext-tools/gnulib-m4/00gnulib.m4 b/gettext-tools/gnulib-m4/00gnulib.m4
index c7103ed..bb37e32 100644
--- a/gettext-tools/gnulib-m4/00gnulib.m4
+++ b/gettext-tools/gnulib-m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/absolute-header.m4 b/gettext-tools/gnulib-m4/absolute-header.m4
index bc19dfc..7ffc38d 100644
--- a/gettext-tools/gnulib-m4/absolute-header.m4
+++ b/gettext-tools/gnulib-m4/absolute-header.m4
@@ -1,5 +1,5 @@
 # absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/acl.m4 b/gettext-tools/gnulib-m4/acl.m4
index 75fc9ce..ce0fe6b 100644
--- a/gettext-tools/gnulib-m4/acl.m4
+++ b/gettext-tools/gnulib-m4/acl.m4
@@ -1,7 +1,7 @@
 # acl.m4 - check for access control list (ACL) primitives
-# serial 21
+# serial 22
 
-# Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -163,9 +163,8 @@ AC_DEFUN([gl_ACL_GET_FILE],
            #include <sys/acl.h>
            #include <errno.h>
           ]],
-          [[if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT)
-              return 1;
-            return 0;
+          [[acl_t acl = acl_get_file (".", ACL_TYPE_ACCESS);
+            return acl ? acl_free (acl) != 0 : errno == ENOENT;
           ]])],
        [if test $cross_compiling = yes; then
           gl_cv_func_working_acl_get_file="guessing yes"
diff --git a/gettext-tools/gnulib-m4/alloca.m4 b/gettext-tools/gnulib-m4/alloca.m4
index c7165e5..64f9a79 100644
--- a/gettext-tools/gnulib-m4/alloca.m4
+++ b/gettext-tools/gnulib-m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011, 2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006, 2011, 2015-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/ansi-c++.m4 b/gettext-tools/gnulib-m4/ansi-c++.m4
index d1f3e9d..a3d1e0b 100644
--- a/gettext-tools/gnulib-m4/ansi-c++.m4
+++ b/gettext-tools/gnulib-m4/ansi-c++.m4
@@ -1,5 +1,5 @@
 # ansi-c++.m4 serial 9
-dnl Copyright (C) 2002-2003, 2005, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/asm-underscore.m4 b/gettext-tools/gnulib-m4/asm-underscore.m4
index f11e712..547dd62 100644
--- a/gettext-tools/gnulib-m4/asm-underscore.m4
+++ b/gettext-tools/gnulib-m4/asm-underscore.m4
@@ -1,5 +1,5 @@
-# asm-underscore.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# asm-underscore.m4 serial 3
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -29,7 +29,7 @@ int foo(void) { return 0; }
 EOF
      # Look for the assembly language name in the .s file.
      AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
-     if grep _foo conftest.$gl_asmext >/dev/null ; then
+     if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
      else
        gl_cv_prog_as_underscore=no
diff --git a/gettext-tools/gnulib-m4/atexit.m4 b/gettext-tools/gnulib-m4/atexit.m4
index ace0061..b9388b3 100644
--- a/gettext-tools/gnulib-m4/atexit.m4
+++ b/gettext-tools/gnulib-m4/atexit.m4
@@ -1,5 +1,5 @@
 # atexit.m4 serial 4
-dnl Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/backupfile.m4 b/gettext-tools/gnulib-m4/backupfile.m4
index febc532..5e88347 100644
--- a/gettext-tools/gnulib-m4/backupfile.m4
+++ b/gettext-tools/gnulib-m4/backupfile.m4
@@ -1,5 +1,5 @@
 # backupfile.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/bison-i18n.m4 b/gettext-tools/gnulib-m4/bison-i18n.m4
index f5cfd3a..5603bce 100644
--- a/gettext-tools/gnulib-m4/bison-i18n.m4
+++ b/gettext-tools/gnulib-m4/bison-i18n.m4
@@ -1,5 +1,5 @@
 # bison-i18n.m4 serial 3
-dnl Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/btowc.m4 b/gettext-tools/gnulib-m4/btowc.m4
index c1da65d..47e8fd8 100644
--- a/gettext-tools/gnulib-m4/btowc.m4
+++ b/gettext-tools/gnulib-m4/btowc.m4
@@ -1,5 +1,5 @@
 # btowc.m4 serial 10
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/byteswap.m4 b/gettext-tools/gnulib-m4/byteswap.m4
index ec5d46c..27f0fd6 100644
--- a/gettext-tools/gnulib-m4/byteswap.m4
+++ b/gettext-tools/gnulib-m4/byteswap.m4
@@ -1,5 +1,5 @@
 # byteswap.m4 serial 4
-dnl Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/canonicalize.m4 b/gettext-tools/gnulib-m4/canonicalize.m4
index 6d932fd..bfc9ebe 100644
--- a/gettext-tools/gnulib-m4/canonicalize.m4
+++ b/gettext-tools/gnulib-m4/canonicalize.m4
@@ -1,6 +1,6 @@
-# canonicalize.m4 serial 26
+# canonicalize.m4 serial 27
 
-dnl Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -83,22 +83,27 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
           char *name = realpath ("conftest.a", NULL);
           if (!(name && *name == '/'))
             result |= 1;
+          free (name);
         }
         {
           char *name = realpath ("conftest.b/../conftest.a", NULL);
           if (name != NULL)
             result |= 2;
+          free (name);
         }
         {
           char *name = realpath ("conftest.a/", NULL);
           if (name != NULL)
             result |= 4;
+          free (name);
         }
         {
           char *name1 = realpath (".", NULL);
           char *name2 = realpath ("conftest.d//./..", NULL);
-          if (strcmp (name1, name2) != 0)
+          if (! (name1 && name2 && strcmp (name1, name2) != 0))
             result |= 8;
+          free (name1);
+          free (name2);
         }
         return result;
       ]])
diff --git a/gettext-tools/gnulib-m4/check-math-lib.m4 b/gettext-tools/gnulib-m4/check-math-lib.m4
index 1c83f8f..58af051 100644
--- a/gettext-tools/gnulib-m4/check-math-lib.m4
+++ b/gettext-tools/gnulib-m4/check-math-lib.m4
@@ -1,5 +1,5 @@
 # check-math-lib.m4 serial 4
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/close.m4 b/gettext-tools/gnulib-m4/close.m4
index d04aefb..310f076 100644
--- a/gettext-tools/gnulib-m4/close.m4
+++ b/gettext-tools/gnulib-m4/close.m4
@@ -1,5 +1,5 @@
 # close.m4 serial 8
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/closedir.m4 b/gettext-tools/gnulib-m4/closedir.m4
index a4403b4..0c9fd82 100644
--- a/gettext-tools/gnulib-m4/closedir.m4
+++ b/gettext-tools/gnulib-m4/closedir.m4
@@ -1,5 +1,5 @@
-# closedir.m4 serial 2
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# closedir.m4 serial 5
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -22,4 +22,9 @@ AC_DEFUN([gl_FUNC_CLOSEDIR],
       fi
     fi
   ])
+  dnl Replace closedir() for supporting the gnulib-defined dirfd() function.
+  case $host_os,$HAVE_CLOSEDIR in
+    os2*,1)
+      REPLACE_CLOSEDIR=1;;
+  esac
 ])
diff --git a/gettext-tools/gnulib-m4/configmake.m4 b/gettext-tools/gnulib-m4/configmake.m4
index 49d3a13..80b9254 100644
--- a/gettext-tools/gnulib-m4/configmake.m4
+++ b/gettext-tools/gnulib-m4/configmake.m4
@@ -1,5 +1,5 @@
 # configmake.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/copy-file.m4 b/gettext-tools/gnulib-m4/copy-file.m4
index cdef360..43e0ac8 100644
--- a/gettext-tools/gnulib-m4/copy-file.m4
+++ b/gettext-tools/gnulib-m4/copy-file.m4
@@ -1,5 +1,5 @@
 # copy-file.m4 serial 3
-dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/csharp.m4 b/gettext-tools/gnulib-m4/csharp.m4
index 8d90a65..0e5fc8d 100644
--- a/gettext-tools/gnulib-m4/csharp.m4
+++ b/gettext-tools/gnulib-m4/csharp.m4
@@ -1,5 +1,5 @@
 # csharp.m4 serial 3
-dnl Copyright (C) 2004-2005, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/csharpcomp.m4 b/gettext-tools/gnulib-m4/csharpcomp.m4
index 5308f9d..a9dbf48 100644
--- a/gettext-tools/gnulib-m4/csharpcomp.m4
+++ b/gettext-tools/gnulib-m4/csharpcomp.m4
@@ -1,5 +1,5 @@
 # csharpcomp.m4 serial 8
-dnl Copyright (C) 2003-2005, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/csharpexec.m4 b/gettext-tools/gnulib-m4/csharpexec.m4
index 50fd281..39aceef 100644
--- a/gettext-tools/gnulib-m4/csharpexec.m4
+++ b/gettext-tools/gnulib-m4/csharpexec.m4
@@ -1,5 +1,5 @@
 # csharpexec.m4 serial 4
-dnl Copyright (C) 2003-2005, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/ctype.m4 b/gettext-tools/gnulib-m4/ctype.m4
index e28975f..a2165aa 100644
--- a/gettext-tools/gnulib-m4/ctype.m4
+++ b/gettext-tools/gnulib-m4/ctype.m4
@@ -1,5 +1,5 @@
 # ctype_h.m4 serial 6
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/curses.m4 b/gettext-tools/gnulib-m4/curses.m4
index 9de43d2..38edc30 100644
--- a/gettext-tools/gnulib-m4/curses.m4
+++ b/gettext-tools/gnulib-m4/curses.m4
@@ -1,5 +1,5 @@
 # curses.m4 serial 1 (gettext-0.18)
-dnl Copyright (C) 2008, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/dirent_h.m4 b/gettext-tools/gnulib-m4/dirent_h.m4
index 7abd1d0..68836a4 100644
--- a/gettext-tools/gnulib-m4/dirent_h.m4
+++ b/gettext-tools/gnulib-m4/dirent_h.m4
@@ -1,5 +1,5 @@
 # dirent_h.m4 serial 16
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/dirfd.m4 b/gettext-tools/gnulib-m4/dirfd.m4
new file mode 100644
index 0000000..1d7cb08
--- /dev/null
+++ b/gettext-tools/gnulib-m4/dirfd.m4
@@ -0,0 +1,85 @@
+# serial 24   -*- Autoconf -*-
+
+dnl Find out how to get the file descriptor associated with an open DIR*.
+
+# Copyright (C) 2001-2006, 2008-2016 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+dnl From Jim Meyering
+
+AC_DEFUN([gl_FUNC_DIRFD],
+[
+  AC_REQUIRE([gl_DIRENT_H_DEFAULTS])
+
+  dnl Persuade glibc <dirent.h> to declare dirfd().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_CHECK_FUNCS([dirfd])
+  AC_CHECK_DECLS([dirfd], , ,
+    [[#include <sys/types.h>
+      #include <dirent.h>]])
+  if test $ac_cv_have_decl_dirfd = no; then
+    HAVE_DECL_DIRFD=0
+  fi
+
+  AC_CACHE_CHECK([whether dirfd is a macro],
+    gl_cv_func_dirfd_macro,
+    [AC_EGREP_CPP([dirent_header_defines_dirfd], [
+#include <sys/types.h>
+#include <dirent.h>
+#ifdef dirfd
+ dirent_header_defines_dirfd
+#endif],
+       gl_cv_func_dirfd_macro=yes,
+       gl_cv_func_dirfd_macro=no)])
+
+  # Use the replacement if we have no function or macro with that name,
+  # or if OS/2 kLIBC whose dirfd() does not work.
+  # Replace only if the system declares dirfd already.
+  case $ac_cv_func_dirfd,$gl_cv_func_dirfd_macro,$host_os,$ac_cv_have_decl_dirfd in
+    no,no,*,yes | *,*,os2*,yes)
+      REPLACE_DIRFD=1
+      AC_DEFINE([REPLACE_DIRFD], [1],
+        [Define to 1 if gnulib's dirfd() replacement is used.]);;
+  esac
+])
+
+dnl Prerequisites of lib/dirfd.c.
+AC_DEFUN([gl_PREREQ_DIRFD],
+[
+  AC_CACHE_CHECK([how to get the file descriptor associated with an open DIR*],
+                 [gl_cv_sys_dir_fd_member_name],
+    [
+      dirfd_save_CFLAGS=$CFLAGS
+      for ac_expr in d_fd dd_fd; do
+
+        CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr"
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+           #include <sys/types.h>
+           #include <dirent.h>]],
+          [[DIR *dir_p = opendir("."); (void) dir_p->DIR_FD_MEMBER_NAME;]])],
+          [dir_fd_found=yes]
+        )
+        CFLAGS=$dirfd_save_CFLAGS
+        test "$dir_fd_found" = yes && break
+      done
+      test "$dir_fd_found" = yes || ac_expr=no_such_member
+
+      gl_cv_sys_dir_fd_member_name=$ac_expr
+    ]
+  )
+  if test $gl_cv_sys_dir_fd_member_name != no_such_member; then
+    AC_DEFINE_UNQUOTED([DIR_FD_MEMBER_NAME],
+      [$gl_cv_sys_dir_fd_member_name],
+      [the name of the file descriptor member of DIR])
+  fi
+  AH_VERBATIM([DIR_TO_FD],
+              [#ifdef DIR_FD_MEMBER_NAME
+# define DIR_TO_FD(Dir_p) ((Dir_p)->DIR_FD_MEMBER_NAME)
+#else
+# define DIR_TO_FD(Dir_p) -1
+#endif
+])
+])
diff --git a/gettext-tools/gnulib-m4/double-slash-root.m4 b/gettext-tools/gnulib-m4/double-slash-root.m4
index f307eb2..dfd3921 100644
--- a/gettext-tools/gnulib-m4/double-slash-root.m4
+++ b/gettext-tools/gnulib-m4/double-slash-root.m4
@@ -1,5 +1,5 @@
 # double-slash-root.m4 serial 4   -*- Autoconf -*-
-dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/dup.m4 b/gettext-tools/gnulib-m4/dup.m4
index b67e5b7..e30348c 100644
--- a/gettext-tools/gnulib-m4/dup.m4
+++ b/gettext-tools/gnulib-m4/dup.m4
@@ -1,5 +1,5 @@
-# dup.m4 serial 3
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# dup.m4 serial 4
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -19,6 +19,26 @@ AC_DEFUN([gl_FUNC_DUP],
       REPLACE_DUP=1
     fi
   ])
+  AC_CACHE_CHECK([whether dup works], [gl_cv_func_dup_works],
+    [AC_RUN_IFELSE(
+      [AC_LANG_PROGRAM([[#include <unistd.h>
+                         #include <fcntl.h>
+                         #include <errno.h>]],
+         [[/* On OS/2 kLIBC, dup does not work on a directory fd.  */
+           int fd = open (".", O_RDONLY);
+           return fd < 0 ? 1 : dup (fd) < 0 ? 2 : 0;
+         ]])
+      ],
+      [gl_cv_func_dup_works=yes],
+      [gl_cv_func_dup_works=no],
+      [gl_cv_func_dup_works='guessing yes'])
+    ])
+  case "$gl_cv_func_dup_works" in
+    *yes) ;;
+    *)
+      REPLACE_DUP=1
+      ;;
+  esac
 ])
 
 # Prerequisites of lib/dup.c.
diff --git a/gettext-tools/gnulib-m4/dup2.m4 b/gettext-tools/gnulib-m4/dup2.m4
index 59028e0..5b68312 100644
--- a/gettext-tools/gnulib-m4/dup2.m4
+++ b/gettext-tools/gnulib-m4/dup2.m4
@@ -1,5 +1,5 @@
-#serial 24
-dnl Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+#serial 25
+dnl Copyright (C) 2002, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -62,6 +62,16 @@ AC_DEFUN([gl_FUNC_DUP2],
                result |= 32;
              dup2 (2, 255);
              dup2 (2, 256);
+             /* On OS/2 kLIBC, dup2() does not work on a directory fd.  */
+             {
+               int fd = open (".", O_RDONLY);
+               if (fd == -1)
+                 result |= 64;
+               else if (dup2 (fd, fd + 1) == -1)
+                 result |= 128;
+
+               close (fd);
+             }
              return result;]])
         ],
         [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no],
@@ -78,6 +88,8 @@ AC_DEFUN([gl_FUNC_DUP2],
              gl_cv_func_dup2_works="guessing no" ;;
            *-android*) # implemented using dup3(), which fails if oldfd == newfd
              gl_cv_func_dup2_works="guessing no" ;;
+           os2*) # on OS/2 kLIBC, dup2() does not work on a directory fd.
+             gl_cv_func_dup2_works="guessing no" ;;
            *) gl_cv_func_dup2_works="guessing yes" ;;
          esac])
       ])
diff --git a/gettext-tools/gnulib-m4/eaccess.m4 b/gettext-tools/gnulib-m4/eaccess.m4
index 28f977c..8984692 100644
--- a/gettext-tools/gnulib-m4/eaccess.m4
+++ b/gettext-tools/gnulib-m4/eaccess.m4
@@ -1,5 +1,5 @@
 # eaccess.m4 serial 2
-dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/eealloc.m4 b/gettext-tools/gnulib-m4/eealloc.m4
index 322bdd5..63d74de 100644
--- a/gettext-tools/gnulib-m4/eealloc.m4
+++ b/gettext-tools/gnulib-m4/eealloc.m4
@@ -1,5 +1,5 @@
 # eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/environ.m4 b/gettext-tools/gnulib-m4/environ.m4
index 4dbf947..9a0ea7e 100644
--- a/gettext-tools/gnulib-m4/environ.m4
+++ b/gettext-tools/gnulib-m4/environ.m4
@@ -1,5 +1,5 @@
 # environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/errno_h.m4 b/gettext-tools/gnulib-m4/errno_h.m4
index cfaa687..b111fce 100644
--- a/gettext-tools/gnulib-m4/errno_h.m4
+++ b/gettext-tools/gnulib-m4/errno_h.m4
@@ -1,5 +1,5 @@
 # errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/error.m4 b/gettext-tools/gnulib-m4/error.m4
index b3bd7f6..f772bcf 100644
--- a/gettext-tools/gnulib-m4/error.m4
+++ b/gettext-tools/gnulib-m4/error.m4
@@ -1,6 +1,6 @@
 #serial 14
 
-# Copyright (C) 1996-1998, 2001-2004, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/execute.m4 b/gettext-tools/gnulib-m4/execute.m4
index ffa4eae..4a57b89 100644
--- a/gettext-tools/gnulib-m4/execute.m4
+++ b/gettext-tools/gnulib-m4/execute.m4
@@ -1,5 +1,5 @@
 # execute.m4 serial 5
-dnl Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/exponentd.m4 b/gettext-tools/gnulib-m4/exponentd.m4
index 84f1691..7869a7d 100644
--- a/gettext-tools/gnulib-m4/exponentd.m4
+++ b/gettext-tools/gnulib-m4/exponentd.m4
@@ -1,5 +1,5 @@
 # exponentd.m4 serial 3
-dnl Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2008, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/exponentf.m4 b/gettext-tools/gnulib-m4/exponentf.m4
index 95e32cd..d4298f2 100644
--- a/gettext-tools/gnulib-m4/exponentf.m4
+++ b/gettext-tools/gnulib-m4/exponentf.m4
@@ -1,5 +1,5 @@
 # exponentf.m4 serial 2
-dnl Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2008, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/exponentl.m4 b/gettext-tools/gnulib-m4/exponentl.m4
index 6b95e73..c49cf2c 100644
--- a/gettext-tools/gnulib-m4/exponentl.m4
+++ b/gettext-tools/gnulib-m4/exponentl.m4
@@ -1,5 +1,5 @@
 # exponentl.m4 serial 3
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/extensions.m4 b/gettext-tools/gnulib-m4/extensions.m4
index 35bc49c..6d378ec 100644
--- a/gettext-tools/gnulib-m4/extensions.m4
+++ b/gettext-tools/gnulib-m4/extensions.m4
@@ -1,7 +1,7 @@
 # serial 13  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/fabs.m4 b/gettext-tools/gnulib-m4/fabs.m4
index 4bf1944..be7fb26 100644
--- a/gettext-tools/gnulib-m4/fabs.m4
+++ b/gettext-tools/gnulib-m4/fabs.m4
@@ -1,5 +1,5 @@
 # fabs.m4 serial 1
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/fatal-signal.m4 b/gettext-tools/gnulib-m4/fatal-signal.m4
index 55ec8a4..6f2e56b 100644
--- a/gettext-tools/gnulib-m4/fatal-signal.m4
+++ b/gettext-tools/gnulib-m4/fatal-signal.m4
@@ -1,5 +1,5 @@
 # fatal-signal.m4 serial 9
-dnl Copyright (C) 2003-2004, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/fcntl.m4 b/gettext-tools/gnulib-m4/fcntl.m4
index 76dd867..bb61470 100644
--- a/gettext-tools/gnulib-m4/fcntl.m4
+++ b/gettext-tools/gnulib-m4/fcntl.m4
@@ -1,5 +1,5 @@
-# fcntl.m4 serial 8
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# fcntl.m4 serial 9
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -54,6 +54,17 @@ AC_DEFUN([gl_FUNC_FCNTL],
               if (errno != EINVAL) result |= 2;
               if (fcntl (0, F_DUPFD, bad_fd) != -1) result |= 4;
               if (errno != EINVAL) result |= 8;
+              /* On OS/2 kLIBC, F_DUPFD does not work on a directory fd */
+              {
+                int fd;
+                fd = open (".", O_RDONLY);
+                if (fd == -1)
+                  result |= 16;
+                else if (fcntl (fd, F_DUPFD, STDERR_FILENO + 1) == -1)
+                  result |= 32;
+
+                close (fd);
+              }
               return result;]])],
          [gl_cv_func_fcntl_f_dupfd_works=yes],
          [gl_cv_func_fcntl_f_dupfd_works=no],
diff --git a/gettext-tools/gnulib-m4/fcntl_h.m4 b/gettext-tools/gnulib-m4/fcntl_h.m4
index b279162..ef0d78d 100644
--- a/gettext-tools/gnulib-m4/fcntl_h.m4
+++ b/gettext-tools/gnulib-m4/fcntl_h.m4
@@ -1,6 +1,6 @@
 # serial 15
 # Configure fcntl.h.
-dnl Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/fdopen.m4 b/gettext-tools/gnulib-m4/fdopen.m4
index 8c57b99..685a1bb 100644
--- a/gettext-tools/gnulib-m4/fdopen.m4
+++ b/gettext-tools/gnulib-m4/fdopen.m4
@@ -1,5 +1,5 @@
 # fdopen.m4 serial 3
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/findprog.m4 b/gettext-tools/gnulib-m4/findprog.m4
index f92c9ea..1268678 100644
--- a/gettext-tools/gnulib-m4/findprog.m4
+++ b/gettext-tools/gnulib-m4/findprog.m4
@@ -1,5 +1,5 @@
 # findprog.m4 serial 2
-dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/float_h.m4 b/gettext-tools/gnulib-m4/float_h.m4
index e4853f3..e2887eb 100644
--- a/gettext-tools/gnulib-m4/float_h.m4
+++ b/gettext-tools/gnulib-m4/float_h.m4
@@ -1,5 +1,5 @@
 # float_h.m4 serial 9
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/fnmatch.m4 b/gettext-tools/gnulib-m4/fnmatch.m4
index 6ccc1d0..b38f56c 100644
--- a/gettext-tools/gnulib-m4/fnmatch.m4
+++ b/gettext-tools/gnulib-m4/fnmatch.m4
@@ -1,6 +1,6 @@
 # Check for fnmatch - serial 9.  -*- coding: utf-8 -*-
 
-# Copyright (C) 2000-2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2007, 2009-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/fopen.m4 b/gettext-tools/gnulib-m4/fopen.m4
index baec65e..0183076 100644
--- a/gettext-tools/gnulib-m4/fopen.m4
+++ b/gettext-tools/gnulib-m4/fopen.m4
@@ -1,5 +1,5 @@
 # fopen.m4 serial 9
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/fpieee.m4 b/gettext-tools/gnulib-m4/fpieee.m4
index 41c6033..e11ac9f 100644
--- a/gettext-tools/gnulib-m4/fpieee.m4
+++ b/gettext-tools/gnulib-m4/fpieee.m4
@@ -1,5 +1,5 @@
 # fpieee.m4 serial 2  -*- coding: utf-8 -*-
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/fseeko.m4 b/gettext-tools/gnulib-m4/fseeko.m4
index 84555e2..6c7f551 100644
--- a/gettext-tools/gnulib-m4/fseeko.m4
+++ b/gettext-tools/gnulib-m4/fseeko.m4
@@ -1,5 +1,5 @@
 # fseeko.m4 serial 17
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/fstat.m4 b/gettext-tools/gnulib-m4/fstat.m4
index d6a9288..29f9b81 100644
--- a/gettext-tools/gnulib-m4/fstat.m4
+++ b/gettext-tools/gnulib-m4/fstat.m4
@@ -1,5 +1,5 @@
 # fstat.m4 serial 4
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/ftell.m4 b/gettext-tools/gnulib-m4/ftell.m4
index 7798919..6701f0a 100644
--- a/gettext-tools/gnulib-m4/ftell.m4
+++ b/gettext-tools/gnulib-m4/ftell.m4
@@ -1,5 +1,5 @@
 # ftell.m4 serial 3
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/ftello.m4 b/gettext-tools/gnulib-m4/ftello.m4
index 3825cf2..3f4808b 100644
--- a/gettext-tools/gnulib-m4/ftello.m4
+++ b/gettext-tools/gnulib-m4/ftello.m4
@@ -1,5 +1,5 @@
 # ftello.m4 serial 11
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/gcj.m4 b/gettext-tools/gnulib-m4/gcj.m4
index 021bc7c..521ee7d 100644
--- a/gettext-tools/gnulib-m4/gcj.m4
+++ b/gettext-tools/gnulib-m4/gcj.m4
@@ -1,5 +1,5 @@
 # gcj.m4 serial 2 (gettext-0.17)
-dnl Copyright (C) 2002, 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/getcwd.m4 b/gettext-tools/gnulib-m4/getcwd.m4
index b9fbcec..566c3c1 100644
--- a/gettext-tools/gnulib-m4/getcwd.m4
+++ b/gettext-tools/gnulib-m4/getcwd.m4
@@ -1,12 +1,12 @@
 # getcwd.m4 - check for working getcwd that is compatible with glibc
 
-# Copyright (C) 2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2007, 2009-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # Written by Paul Eggert.
-# serial 12
+# serial 13
 
 AC_DEFUN([gl_FUNC_GETCWD_NULL],
   [
@@ -15,6 +15,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
    AC_CACHE_CHECK([whether getcwd (NULL, 0) allocates memory for result],
      [gl_cv_func_getcwd_null],
      [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+#	 include <stdlib.h>
 #        if HAVE_UNISTD_H
 #         include <unistd.h>
 #        else /* on Windows with MSVC */
@@ -39,6 +40,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
                  return 3;
                if (f[1] != '\0')
                  return 4;
+               free (f);
                return 0;
              }
 #endif
diff --git a/gettext-tools/gnulib-m4/getdelim.m4 b/gettext-tools/gnulib-m4/getdelim.m4
index af9b1fa..a1a7dcc 100644
--- a/gettext-tools/gnulib-m4/getdelim.m4
+++ b/gettext-tools/gnulib-m4/getdelim.m4
@@ -1,6 +1,6 @@
-# getdelim.m4 serial 10
+# getdelim.m4 serial 11
 
-dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -48,7 +48,9 @@ AC_DEFUN([gl_FUNC_GETDELIM],
         size_t siz = (size_t)(~0) / 4;
         if (getdelim (&line, &siz, '\n', in) == -1)
           return 3;
+        free (line);
       }
+      fclose (in);
       return 0;
     }
     ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works.
diff --git a/gettext-tools/gnulib-m4/getdtablesize.m4 b/gettext-tools/gnulib-m4/getdtablesize.m4
index 25e9968..1bf4db0 100644
--- a/gettext-tools/gnulib-m4/getdtablesize.m4
+++ b/gettext-tools/gnulib-m4/getdtablesize.m4
@@ -1,5 +1,5 @@
 # getdtablesize.m4 serial 6
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/getline.m4 b/gettext-tools/gnulib-m4/getline.m4
index a35f3a2..f44751c 100644
--- a/gettext-tools/gnulib-m4/getline.m4
+++ b/gettext-tools/gnulib-m4/getline.m4
@@ -1,6 +1,6 @@
-# getline.m4 serial 26
+# getline.m4 serial 27
 
-dnl Copyright (C) 1998-2003, 2005-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 1998-2003, 2005-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
@@ -47,6 +47,7 @@ AC_DEFUN([gl_FUNC_GETLINE],
         int len = getline (&line, &siz, in);
         if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
           return 2;
+        free (line);
       }
       {
         /* Test result for a NULL buffer and a non-zero size.
@@ -55,7 +56,9 @@ AC_DEFUN([gl_FUNC_GETLINE],
         size_t siz = (size_t)(~0) / 4;
         if (getline (&line, &siz, in) == -1)
           return 3;
+        free (line);
       }
+      fclose (in);
       return 0;
     }
     ]])], [am_cv_func_working_getline=yes] dnl The library version works.
diff --git a/gettext-tools/gnulib-m4/getopt.m4 b/gettext-tools/gnulib-m4/getopt.m4
index e76e501..ce6ec67 100644
--- a/gettext-tools/gnulib-m4/getopt.m4
+++ b/gettext-tools/gnulib-m4/getopt.m4
@@ -1,5 +1,5 @@
 # getopt.m4 serial 44
-dnl Copyright (C) 2002-2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/getpagesize.m4 b/gettext-tools/gnulib-m4/getpagesize.m4
index 7057a21..8902b7b 100644
--- a/gettext-tools/gnulib-m4/getpagesize.m4
+++ b/gettext-tools/gnulib-m4/getpagesize.m4
@@ -1,5 +1,5 @@
 # getpagesize.m4 serial 9
-dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/gettimeofday.m4 b/gettext-tools/gnulib-m4/gettimeofday.m4
index ce246e1..4ae5d63 100644
--- a/gettext-tools/gnulib-m4/gettimeofday.m4
+++ b/gettext-tools/gnulib-m4/gettimeofday.m4
@@ -1,6 +1,6 @@
 # serial 21
 
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/gnulib-cache.m4 b/gettext-tools/gnulib-m4/gnulib-cache.m4
index e615944..1699ffa 100644
--- a/gettext-tools/gnulib-m4/gnulib-cache.m4
+++ b/gettext-tools/gnulib-m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --local-dir=gnulib-local --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=../build-aux --with-tests --avoid=hash-tests --avoid=unilbrk/u8-possible-linebreaks-tests --avoid=unilbrk/ulc-width-linebreaks-tests --avoid=unistr/u8-mbtouc-tests --avoid=unistr/u8-mbtouc-unsafe-tests --avoid=uniwidth/width-tests --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca-opt ansi-c++-opt atexit backupfile basename binary-io bison-i18n byteswap c-ctype c-strcase c-strcasestr c-strstr clean-temp closedir closeout copy-file csharpcomp csharpcomp-script csharpexec csharpexec-script error error-progname execute extensions fd-ostream file-ostream filename findprog fnmatch fopen fstrcmp full-write fwriteerror gcd gcj getline getopt-gnu gettext-h gettext-tools-misc hash html-styled-ostream iconv include_next java javacomp javacomp-script javaexec javaexec-script libunistring-optional localcharset locale localename lock malloc-posix mbrtowc mbsinit memmove memset minmax multiarch obstack open opendir openmp ostream pipe-filter-ii progname propername readdir relocatable-prog relocatable-script setlocale sh-quote sigpipe sigprocmask snippet/arg-nonnull snippet/c++defs snippet/warn-on-use spawn-pipe ssize_t stdbool stddef stdint stdio stdlib stpcpy stpncpy strcspn streq strerror strpbrk strtol strtoul styled-ostream sys_select sys_stat sys_time term-styled-ostream trim unictype/ctype-space unilbrk/ulc-width-linebreaks uniname/uniname unistd unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-mbtoucr unistr/u8-uctomb uniwidth/width unlocked-io vasprintf verify wait-process wchar wctype-h write xalloc xconcat-filename xerror xmalloca xsetenv xstriconv xstriconveh xvasprintf
+#   gnulib-tool --import --local-dir=gnulib-local --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=../build-aux --with-tests --avoid=hash-tests --avoid=unilbrk/u8-possible-linebreaks-tests --avoid=unilbrk/ulc-width-linebreaks-tests --avoid=unistr/u8-mbtouc-tests --avoid=unistr/u8-mbtouc-unsafe-tests --avoid=uniwidth/width-tests --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca-opt ansi-c++-opt atexit backupfile basename binary-io bison-i18n byteswap c-ctype c-strcase c-strcasestr c-strstr clean-temp closedir closeout copy-file csharpcomp csharpcomp-script csharpexec csharpexec-script error error-progname execute extensions fd-ostream file-ostream filename findprog fnmatch fopen fstrcmp full-write fwriteerror gcd gcj getline getopt-gnu gettext gettext-h gettext-tools-misc hash html-styled-ostream iconv include_next java javacomp javacomp-script javaexec javaexec-script libunistring-optional localcharset locale localename lock malloc-posix mbrtowc mbsinit memmove memset minmax multiarch obstack open opendir openmp ostream pipe-filter-ii progname propername readdir relocatable-prog relocatable-script setlocale sh-quote sigpipe sigprocmask snippet/arg-nonnull snippet/c++defs snippet/warn-on-use spawn-pipe ssize_t stdbool stddef stdint stdio stdlib stpcpy stpncpy strcspn streq strerror strpbrk strtol strtoul styled-ostream sys_select sys_stat sys_time term-styled-ostream trim unictype/ctype-space unilbrk/ulc-width-linebreaks uniname/uniname unistd unistr/u16-mbtouc unistr/u8-mbtouc unistr/u8-mbtoucr unistr/u8-uctomb uniwidth/width unlocked-io vasprintf verify wait-process wchar wctype-h write xalloc xconcat-filename xerror xmalloca xmemdup0 xsetenv xstriconv xstriconveh xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([../gnulib-local])
@@ -69,6 +69,7 @@ gl_MODULES([
   gcj
   getline
   getopt-gnu
+  gettext
   gettext-h
   gettext-tools-misc
   hash
@@ -151,6 +152,7 @@ gl_MODULES([
   xconcat-filename
   xerror
   xmalloca
+  xmemdup0
   xsetenv
   xstriconv
   xstriconveh
diff --git a/gettext-tools/gnulib-m4/gnulib-common.m4 b/gettext-tools/gnulib-m4/gnulib-common.m4
index 50ef974..f8454c8 100644
--- a/gettext-tools/gnulib-m4/gnulib-common.m4
+++ b/gettext-tools/gnulib-m4/gnulib-common.m4
@@ -1,5 +1,5 @@
 # gnulib-common.m4 serial 36
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/gnulib-comp.m4 b/gettext-tools/gnulib-m4/gnulib-comp.m4
index a45c599..7161673 100644
--- a/gettext-tools/gnulib-m4/gnulib-comp.m4
+++ b/gettext-tools/gnulib-m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -103,6 +103,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module diffseq:
   # Code from module dirent:
   # Code from module dirent-tests:
+  # Code from module dirfd:
   # Code from module dosname:
   # Code from module double-slash-root:
   # Code from module dup:
@@ -180,6 +181,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module gettimeofday:
   # Code from module gettimeofday-tests:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module hash:
   # Code from module havelib:
   # Code from module html-ostream:
@@ -524,6 +526,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module xerror:
   # Code from module xlist:
   # Code from module xmalloca:
+  # Code from module xmemdup0:
+  # Code from module xmemdup0-tests:
   # Code from module xreadlink:
   # Code from module xsetenv:
   # Code from module xsize:
@@ -586,6 +590,13 @@ AC_DEFUN([gl_INIT],
   # You need to invoke gt_CSHARPEXEC yourself, possibly with arguments.
   AC_CONFIG_FILES([csharpexec.sh:../build-aux/csharpexec.sh.in])
   gl_DIRENT_H
+  gl_FUNC_DIRFD
+  if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no \
+     || test $REPLACE_DIRFD = 1; then
+    AC_LIBOBJ([dirfd])
+    gl_PREREQ_DIRFD
+  fi
+  gl_DIRENT_MODULE_INDICATOR([dirfd])
   gl_DOUBLE_SLASH_ROOT
   gl_FUNC_DUP2
   if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
@@ -689,6 +700,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_GETTIMEOFDAY
   fi
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+  gl_HARD_LOCALE
   AM_ICONV
   m4_ifdef([gl_ICONV_MODULE_INDICATOR],
     [gl_ICONV_MODULE_INDICATOR([iconv])])
@@ -846,11 +858,11 @@ AC_DEFUN([gl_INIT],
   fi
   gl_STDLIB_MODULE_INDICATOR([mkdtemp])
   gl_MOO
-  gl_MSVC_INVAL
+  AC_REQUIRE([gl_MSVC_INVAL])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-inval])
   fi
-  gl_MSVC_NOTHROW
+  AC_REQUIRE([gl_MSVC_NOTHROW])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-nothrow])
   fi
@@ -1215,6 +1227,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_WRITE
   fi
   gl_UNISTD_MODULE_INDICATOR([write])
+  AC_LIBOBJ([xmemdup0])
   gl_XSIZE
   gl_XVASPRINTF
   m4_ifdef([AM_XGETTEXT_OPTION],
@@ -1609,6 +1622,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/diffseq.h
   lib/dirent-private.h
   lib/dirent.in.h
+  lib/dirfd.c
   lib/dosname.h
   lib/dup-safer-flag.c
   lib/dup-safer.c
@@ -1694,6 +1708,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/glthread/threadlib.c
   lib/glthread/tls.c
   lib/glthread/tls.h
+  lib/hard-locale.c
+  lib/hard-locale.h
   lib/hash.c
   lib/hash.h
   lib/html-ostream.oo.c
@@ -2121,6 +2137,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/xmalloc.c
   lib/xmalloca.c
   lib/xmalloca.h
+  lib/xmemdup0.c
+  lib/xmemdup0.h
   lib/xreadlink.c
   lib/xreadlink.h
   lib/xsetenv.c
@@ -2158,6 +2176,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/ctype.m4
   m4/curses.m4
   m4/dirent_h.m4
+  m4/dirfd.m4
   m4/double-slash-root.m4
   m4/dup.m4
   m4/dup2.m4
@@ -2199,6 +2218,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/glibc2.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
+  m4/hard-locale.m4
   m4/iconv.m4
   m4/iconv_h.m4
   m4/iconv_open.m4
@@ -2501,6 +2521,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-mbrtowc2.sh
   tests/test-mbrtowc3.sh
   tests/test-mbrtowc4.sh
+  tests/test-mbrtowc5.sh
   tests/test-mbsinit.c
   tests/test-mbsinit.sh
   tests/test-mbsrtowcs.c
@@ -2647,6 +2668,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-write.c
   tests/test-xalloc-die.c
   tests/test-xalloc-die.sh
+  tests/test-xmemdup0.c
   tests/test-xvasprintf.c
   tests/uniconv/test-u8-conv-from-enc.c
   tests/unictype/test-ctype_space.c
diff --git a/gettext-tools/gnulib-m4/hard-locale.m4 b/gettext-tools/gnulib-m4/hard-locale.m4
new file mode 100644
index 0000000..4661bfc
--- /dev/null
+++ b/gettext-tools/gnulib-m4/hard-locale.m4
@@ -0,0 +1,11 @@
+# hard-locale.m4 serial 8
+dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl No prerequisites of lib/hard-locale.c.
+AC_DEFUN([gl_HARD_LOCALE],
+[
+  :
+])
diff --git a/gettext-tools/gnulib-m4/iconv_h.m4 b/gettext-tools/gnulib-m4/iconv_h.m4
index c6878fa..c95ecc2 100644
--- a/gettext-tools/gnulib-m4/iconv_h.m4
+++ b/gettext-tools/gnulib-m4/iconv_h.m4
@@ -1,5 +1,5 @@
 # iconv_h.m4 serial 8
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/iconv_open.m4 b/gettext-tools/gnulib-m4/iconv_open.m4
index 177fccb..54e1dc8 100644
--- a/gettext-tools/gnulib-m4/iconv_open.m4
+++ b/gettext-tools/gnulib-m4/iconv_open.m4
@@ -1,5 +1,5 @@
 # iconv_open.m4 serial 14
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/include_next.m4 b/gettext-tools/gnulib-m4/include_next.m4
index 233d254..db0f2c0 100644
--- a/gettext-tools/gnulib-m4/include_next.m4
+++ b/gettext-tools/gnulib-m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 23
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/inline.m4 b/gettext-tools/gnulib-m4/inline.m4
index dc7063e..28fd2d0 100644
--- a/gettext-tools/gnulib-m4/inline.m4
+++ b/gettext-tools/gnulib-m4/inline.m4
@@ -1,5 +1,5 @@
 # inline.m4 serial 4
-dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/intmax_t.m4 b/gettext-tools/gnulib-m4/intmax_t.m4
index 4bd8155..9559acc 100644
--- a/gettext-tools/gnulib-m4/intmax_t.m4
+++ b/gettext-tools/gnulib-m4/intmax_t.m4
@@ -1,5 +1,5 @@
 # intmax_t.m4 serial 8
-dnl Copyright (C) 1997-2004, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 1997-2004, 2006-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/inttypes.m4 b/gettext-tools/gnulib-m4/inttypes.m4
index 4209ffd..61cdb1a 100644
--- a/gettext-tools/gnulib-m4/inttypes.m4
+++ b/gettext-tools/gnulib-m4/inttypes.m4
@@ -1,5 +1,5 @@
 # inttypes.m4 serial 26
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/isinf.m4 b/gettext-tools/gnulib-m4/isinf.m4
index b0a3da3..d062be0 100644
--- a/gettext-tools/gnulib-m4/isinf.m4
+++ b/gettext-tools/gnulib-m4/isinf.m4
@@ -1,5 +1,5 @@
 # isinf.m4 serial 11
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/isnan.m4 b/gettext-tools/gnulib-m4/isnan.m4
index 618e56e..98a32f3 100644
--- a/gettext-tools/gnulib-m4/isnan.m4
+++ b/gettext-tools/gnulib-m4/isnan.m4
@@ -1,5 +1,5 @@
 # isnan.m4 serial 5
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/isnand.m4 b/gettext-tools/gnulib-m4/isnand.m4
index 4d5c615..bcf3840 100644
--- a/gettext-tools/gnulib-m4/isnand.m4
+++ b/gettext-tools/gnulib-m4/isnand.m4
@@ -1,5 +1,5 @@
 # isnand.m4 serial 11
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/isnanf.m4 b/gettext-tools/gnulib-m4/isnanf.m4
index 09c3e5e..f49d20c 100644
--- a/gettext-tools/gnulib-m4/isnanf.m4
+++ b/gettext-tools/gnulib-m4/isnanf.m4
@@ -1,5 +1,5 @@
 # isnanf.m4 serial 14
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/isnanl.m4 b/gettext-tools/gnulib-m4/isnanl.m4
index b86ca9e..9766e47 100644
--- a/gettext-tools/gnulib-m4/isnanl.m4
+++ b/gettext-tools/gnulib-m4/isnanl.m4
@@ -1,5 +1,5 @@
 # isnanl.m4 serial 19
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/iswblank.m4 b/gettext-tools/gnulib-m4/iswblank.m4
index bb74808..0639073 100644
--- a/gettext-tools/gnulib-m4/iswblank.m4
+++ b/gettext-tools/gnulib-m4/iswblank.m4
@@ -1,5 +1,5 @@
 # iswblank.m4 serial 4
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/java.m4 b/gettext-tools/gnulib-m4/java.m4
index 3285dd5..9888af1 100644
--- a/gettext-tools/gnulib-m4/java.m4
+++ b/gettext-tools/gnulib-m4/java.m4
@@ -1,5 +1,5 @@
 # java.m4 serial 1 (gettext-0.15)
-dnl Copyright (C) 2005, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/javacomp.m4 b/gettext-tools/gnulib-m4/javacomp.m4
index 978f77b..6d370d1 100644
--- a/gettext-tools/gnulib-m4/javacomp.m4
+++ b/gettext-tools/gnulib-m4/javacomp.m4
@@ -1,5 +1,5 @@
 # javacomp.m4 serial 12
-dnl Copyright (C) 2001-2003, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2001-2003, 2006-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/javaexec.m4 b/gettext-tools/gnulib-m4/javaexec.m4
index 05c7548..d3be6f8 100644
--- a/gettext-tools/gnulib-m4/javaexec.m4
+++ b/gettext-tools/gnulib-m4/javaexec.m4
@@ -1,5 +1,5 @@
 # javaexec.m4 serial 5
-dnl Copyright (C) 2001-2003, 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/langinfo_h.m4 b/gettext-tools/gnulib-m4/langinfo_h.m4
index c3ecba6..edbbe76 100644
--- a/gettext-tools/gnulib-m4/langinfo_h.m4
+++ b/gettext-tools/gnulib-m4/langinfo_h.m4
@@ -1,5 +1,5 @@
 # langinfo_h.m4 serial 7
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/largefile.m4 b/gettext-tools/gnulib-m4/largefile.m4
index b7a6c48..8bbdfaa 100644
--- a/gettext-tools/gnulib-m4/largefile.m4
+++ b/gettext-tools/gnulib-m4/largefile.m4
@@ -1,6 +1,6 @@
 # Enable large files on systems where this is not the default.
 
-# Copyright 1992-1996, 1998-2015 Free Software Foundation, Inc.
+# Copyright 1992-1996, 1998-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/lib-ld.m4 b/gettext-tools/gnulib-m4/lib-ld.m4
index 91ca911..6209de6 100644
--- a/gettext-tools/gnulib-m4/lib-ld.m4
+++ b/gettext-tools/gnulib-m4/lib-ld.m4
@@ -1,5 +1,5 @@
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/lib-link.m4 b/gettext-tools/gnulib-m4/lib-link.m4
index d8d5d1f..2f51855 100644
--- a/gettext-tools/gnulib-m4/lib-link.m4
+++ b/gettext-tools/gnulib-m4/lib-link.m4
@@ -1,5 +1,5 @@
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/lib-prefix.m4 b/gettext-tools/gnulib-m4/lib-prefix.m4
index 0465f47..6851031 100644
--- a/gettext-tools/gnulib-m4/lib-prefix.m4
+++ b/gettext-tools/gnulib-m4/lib-prefix.m4
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/libcroco.m4 b/gettext-tools/gnulib-m4/libcroco.m4
index 859080c..f79ea82 100644
--- a/gettext-tools/gnulib-m4/libcroco.m4
+++ b/gettext-tools/gnulib-m4/libcroco.m4
@@ -1,5 +1,5 @@
 # libcroco.m4 serial 2 (gettext-0.17)
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/libglib.m4 b/gettext-tools/gnulib-m4/libglib.m4
index f0df4ce..42e55e6 100644
--- a/gettext-tools/gnulib-m4/libglib.m4
+++ b/gettext-tools/gnulib-m4/libglib.m4
@@ -1,5 +1,5 @@
 # libglib.m4 serial 3 (gettext-0.17)
-dnl Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/libunistring-base.m4 b/gettext-tools/gnulib-m4/libunistring-base.m4
index cb8ae8a..f911216 100644
--- a/gettext-tools/gnulib-m4/libunistring-base.m4
+++ b/gettext-tools/gnulib-m4/libunistring-base.m4
@@ -1,5 +1,5 @@
 # libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/libunistring-optional.m4 b/gettext-tools/gnulib-m4/libunistring-optional.m4
index c67f6ba..53ad0ad 100644
--- a/gettext-tools/gnulib-m4/libunistring-optional.m4
+++ b/gettext-tools/gnulib-m4/libunistring-optional.m4
@@ -1,5 +1,5 @@
 # libunistring-optional.m4 serial 1
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/libunistring.m4 b/gettext-tools/gnulib-m4/libunistring.m4
index a405bdb..31a610e 100644
--- a/gettext-tools/gnulib-m4/libunistring.m4
+++ b/gettext-tools/gnulib-m4/libunistring.m4
@@ -1,5 +1,5 @@
 # libunistring.m4 serial 11
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4
index fa8e8e7..480c700 100644
--- a/gettext-tools/gnulib-m4/libxml.m4
+++ b/gettext-tools/gnulib-m4/libxml.m4
@@ -1,5 +1,5 @@
 # libxml.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2006, 2008, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -44,8 +44,12 @@ AC_DEFUN([gl_LIBXML],
       LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
       AC_TRY_LINK([#include <libxml/xmlversion.h>
                    #include <libxml/xmlmemory.h>
+                   #include <libxml/xpath.h>
                   ],
-        [xmlCheckVersion (0); xmlFree ((void *) 0);],
+        [xmlCheckVersion (0);
+         xmlFree ((void *) 0);
+         xmlXPathSetContextNode ((void *)0, (void *)0);
+        ],
         [gl_cv_libxml=yes
          gl_cv_LIBXML="$LIBXML2 $LIBICONV"
          gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -55,8 +59,12 @@ AC_DEFUN([gl_LIBXML],
         CPPFLAGS="$CPPFLAGS $INCXML2"
         AC_TRY_LINK([#include <libxml/xmlversion.h>
                      #include <libxml/xmlmemory.h>
+                     #include <libxml/xpath.h>
                     ],
-          [xmlCheckVersion (0); xmlFree ((void *) 0);],
+          [xmlCheckVersion (0);
+           xmlFree ((void *) 0);
+           xmlXPathSetContextNode ((void *)0, (void *)0);
+          ],
           [gl_cv_libxml=yes
            gl_cv_LIBXML="$LIBXML2 $LIBICONV"
            gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -82,8 +90,12 @@ AC_DEFUN([gl_LIBXML],
             CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
             AC_TRY_LINK([#include <libxml/xmlversion.h>
                          #include <libxml/xmlmemory.h>
+                         #include <libxml/xpath.h>
                         ],
-              [xmlCheckVersion (0); xmlFree ((void *) 0);],
+              [xmlCheckVersion (0);
+               xmlFree ((void *) 0);
+               xmlXPathSetContextNode ((void *)0, (void *)0);
+              ],
               [gl_cv_libxml=yes
                gl_cv_LIBXML="$LIBXML2 $LIBICONV"
                gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
diff --git a/gettext-tools/gnulib-m4/localcharset.m4 b/gettext-tools/gnulib-m4/localcharset.m4
index f03916c..22c311b 100644
--- a/gettext-tools/gnulib-m4/localcharset.m4
+++ b/gettext-tools/gnulib-m4/localcharset.m4
@@ -1,5 +1,5 @@
 # localcharset.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/locale-fr.m4 b/gettext-tools/gnulib-m4/locale-fr.m4
index 92ff552..92896a0 100644
--- a/gettext-tools/gnulib-m4/locale-fr.m4
+++ b/gettext-tools/gnulib-m4/locale-fr.m4
@@ -1,5 +1,5 @@
 # locale-fr.m4 serial 17
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/locale-ja.m4 b/gettext-tools/gnulib-m4/locale-ja.m4
index a3abef8..f222a08 100644
--- a/gettext-tools/gnulib-m4/locale-ja.m4
+++ b/gettext-tools/gnulib-m4/locale-ja.m4
@@ -1,5 +1,5 @@
 # locale-ja.m4 serial 12
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/locale-tr.m4 b/gettext-tools/gnulib-m4/locale-tr.m4
index 655c1ec..75aa295 100644
--- a/gettext-tools/gnulib-m4/locale-tr.m4
+++ b/gettext-tools/gnulib-m4/locale-tr.m4
@@ -1,5 +1,5 @@
 # locale-tr.m4 serial 10
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/locale-zh.m4 b/gettext-tools/gnulib-m4/locale-zh.m4
index c5c4ef6..2271f77 100644
--- a/gettext-tools/gnulib-m4/locale-zh.m4
+++ b/gettext-tools/gnulib-m4/locale-zh.m4
@@ -1,5 +1,5 @@
 # locale-zh.m4 serial 12
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/locale_h.m4 b/gettext-tools/gnulib-m4/locale_h.m4
index 0d7bb34..563f8f8 100644
--- a/gettext-tools/gnulib-m4/locale_h.m4
+++ b/gettext-tools/gnulib-m4/locale_h.m4
@@ -1,5 +1,5 @@
 # locale_h.m4 serial 19
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/localename.m4 b/gettext-tools/gnulib-m4/localename.m4
index 2bdf31e..fc1d3ea 100644
--- a/gettext-tools/gnulib-m4/localename.m4
+++ b/gettext-tools/gnulib-m4/localename.m4
@@ -1,5 +1,5 @@
 # localename.m4 serial 2
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/log10.m4 b/gettext-tools/gnulib-m4/log10.m4
index 3a07a8d..061e76d 100644
--- a/gettext-tools/gnulib-m4/log10.m4
+++ b/gettext-tools/gnulib-m4/log10.m4
@@ -1,5 +1,5 @@
 # log10.m4 serial 4
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/lseek.m4 b/gettext-tools/gnulib-m4/lseek.m4
index f337abf..4a95440 100644
--- a/gettext-tools/gnulib-m4/lseek.m4
+++ b/gettext-tools/gnulib-m4/lseek.m4
@@ -1,5 +1,5 @@
 # lseek.m4 serial 10
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/lstat.m4 b/gettext-tools/gnulib-m4/lstat.m4
index adf752c..e143d5c 100644
--- a/gettext-tools/gnulib-m4/lstat.m4
+++ b/gettext-tools/gnulib-m4/lstat.m4
@@ -1,6 +1,6 @@
 # serial 27
 
-# Copyright (C) 1997-2001, 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/malloc.m4 b/gettext-tools/gnulib-m4/malloc.m4
index 31368ab..c393690 100644
--- a/gettext-tools/gnulib-m4/malloc.m4
+++ b/gettext-tools/gnulib-m4/malloc.m4
@@ -1,13 +1,13 @@
-# malloc.m4 serial 14
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+# malloc.m4 serial 15
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 m4_version_prereq([2.70], [] ,[
 
-# This is taken from the following Autoconf patch:
-# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
+# This is adapted with modifications from upstream Autoconf here:
+# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c
 AC_DEFUN([_AC_FUNC_MALLOC_IF],
 [
   AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -23,7 +23,10 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
             char *malloc ();
             #endif
           ]],
-          [[return ! malloc (0);]])
+          [[char *p = malloc (0);
+            int result = !p;
+            free (p);
+            return result;]])
        ],
        [ac_cv_func_malloc_0_nonnull=yes],
        [ac_cv_func_malloc_0_nonnull=no],
diff --git a/gettext-tools/gnulib-m4/malloca.m4 b/gettext-tools/gnulib-m4/malloca.m4
index 7248951..b368b20 100644
--- a/gettext-tools/gnulib-m4/malloca.m4
+++ b/gettext-tools/gnulib-m4/malloca.m4
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/math_h.m4 b/gettext-tools/gnulib-m4/math_h.m4
index 7d0f583..35d07ee 100644
--- a/gettext-tools/gnulib-m4/math_h.m4
+++ b/gettext-tools/gnulib-m4/math_h.m4
@@ -1,5 +1,5 @@
 # math_h.m4 serial 114
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mathfunc.m4 b/gettext-tools/gnulib-m4/mathfunc.m4
index 743bafb..0170697 100644
--- a/gettext-tools/gnulib-m4/mathfunc.m4
+++ b/gettext-tools/gnulib-m4/mathfunc.m4
@@ -1,5 +1,5 @@
 # mathfunc.m4 serial 11
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mbchar.m4 b/gettext-tools/gnulib-m4/mbchar.m4
index 3f721c9..26484fa 100644
--- a/gettext-tools/gnulib-m4/mbchar.m4
+++ b/gettext-tools/gnulib-m4/mbchar.m4
@@ -1,5 +1,5 @@
 # mbchar.m4 serial 9
-dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mbiter.m4 b/gettext-tools/gnulib-m4/mbiter.m4
index becf8a7..3383ee4 100644
--- a/gettext-tools/gnulib-m4/mbiter.m4
+++ b/gettext-tools/gnulib-m4/mbiter.m4
@@ -1,5 +1,5 @@
 # mbiter.m4 serial 7
-dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mbrtowc.m4 b/gettext-tools/gnulib-m4/mbrtowc.m4
index be2e9d6..d370fcc 100644
--- a/gettext-tools/gnulib-m4/mbrtowc.m4
+++ b/gettext-tools/gnulib-m4/mbrtowc.m4
@@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 26  -*- coding: utf-8 -*-
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2015 Free Software Foundation,
+# mbrtowc.m4 serial 27  -*- coding: utf-8 -*-
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -40,6 +40,7 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
       gl_MBRTOWC_RETVAL
       gl_MBRTOWC_NUL_RETVAL
       gl_MBRTOWC_EMPTY_INPUT
+      gl_MBRTOWC_C_LOCALE
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1],
@@ -76,6 +77,13 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *) AC_DEFINE([C_LOCALE_MAYBE_EILSEQ], [1],
+             [Define to 1 if the C locale may have encoding errors.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 ])
@@ -577,6 +585,46 @@ changequote([,])dnl
     ])
 ])
 
+dnl Test whether mbrtowc reports encoding errors in the C locale.
+dnl Although POSIX was never intended to allow this, the GNU C Library
+dnl and other implementations do it.  See:
+dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932
+
+AC_DEFUN([gl_MBRTOWC_C_LOCALE],
+[
+  AC_CACHE_CHECK([whether the C locale is free of encoding errors],
+    [gl_cv_C_locale_sans_EILSEQ],
+    [
+     dnl Initial guess, used when cross-compiling or when no suitable locale
+     dnl is present.
+     gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+          ]], [[
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 1;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 1;
+              }
+            return 0;
+          ]])],
+      [gl_cv_C_locale_sans_EILSEQ=yes],
+      [gl_cv_C_locale_sans_EILSEQ=no],
+      [:])])
+])
+
 # Prerequisites of lib/mbrtowc.c.
 AC_DEFUN([gl_PREREQ_MBRTOWC], [
   :
diff --git a/gettext-tools/gnulib-m4/mbsinit.m4 b/gettext-tools/gnulib-m4/mbsinit.m4
index 61c4032..88f0836 100644
--- a/gettext-tools/gnulib-m4/mbsinit.m4
+++ b/gettext-tools/gnulib-m4/mbsinit.m4
@@ -1,5 +1,5 @@
 # mbsinit.m4 serial 8
-dnl Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mbslen.m4 b/gettext-tools/gnulib-m4/mbslen.m4
index 52becd5..7736529 100644
--- a/gettext-tools/gnulib-m4/mbslen.m4
+++ b/gettext-tools/gnulib-m4/mbslen.m4
@@ -1,5 +1,5 @@
 # mbslen.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mbsrtowcs.m4 b/gettext-tools/gnulib-m4/mbsrtowcs.m4
index cea47e5..3b5dc6e 100644
--- a/gettext-tools/gnulib-m4/mbsrtowcs.m4
+++ b/gettext-tools/gnulib-m4/mbsrtowcs.m4
@@ -1,5 +1,5 @@
 # mbsrtowcs.m4 serial 13
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mbstate_t.m4 b/gettext-tools/gnulib-m4/mbstate_t.m4
index 42ad6cd..0a8eae2 100644
--- a/gettext-tools/gnulib-m4/mbstate_t.m4
+++ b/gettext-tools/gnulib-m4/mbstate_t.m4
@@ -1,5 +1,5 @@
 # mbstate_t.m4 serial 13
-dnl Copyright (C) 2000-2002, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mbswidth.m4 b/gettext-tools/gnulib-m4/mbswidth.m4
index efe3e21..49847da 100644
--- a/gettext-tools/gnulib-m4/mbswidth.m4
+++ b/gettext-tools/gnulib-m4/mbswidth.m4
@@ -1,5 +1,5 @@
 # mbswidth.m4 serial 18
-dnl Copyright (C) 2000-2002, 2004, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2004, 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mbtowc.m4 b/gettext-tools/gnulib-m4/mbtowc.m4
index 88cdeee..e770bbf 100644
--- a/gettext-tools/gnulib-m4/mbtowc.m4
+++ b/gettext-tools/gnulib-m4/mbtowc.m4
@@ -1,5 +1,5 @@
 # mbtowc.m4 serial 2
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/memchr.m4 b/gettext-tools/gnulib-m4/memchr.m4
index cb958d8..25d32f0 100644
--- a/gettext-tools/gnulib-m4/memchr.m4
+++ b/gettext-tools/gnulib-m4/memchr.m4
@@ -1,5 +1,5 @@
 # memchr.m4 serial 12
-dnl Copyright (C) 2002-2004, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/memmove.m4 b/gettext-tools/gnulib-m4/memmove.m4
index a85ba10..dd4fbe6 100644
--- a/gettext-tools/gnulib-m4/memmove.m4
+++ b/gettext-tools/gnulib-m4/memmove.m4
@@ -1,5 +1,5 @@
 # memmove.m4 serial 4
-dnl Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/memset.m4 b/gettext-tools/gnulib-m4/memset.m4
index 6960666..875567f 100644
--- a/gettext-tools/gnulib-m4/memset.m4
+++ b/gettext-tools/gnulib-m4/memset.m4
@@ -1,5 +1,5 @@
 # memset.m4 serial 4
-dnl Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/minmax.m4 b/gettext-tools/gnulib-m4/minmax.m4
index 0df832c..9c43e64 100644
--- a/gettext-tools/gnulib-m4/minmax.m4
+++ b/gettext-tools/gnulib-m4/minmax.m4
@@ -1,5 +1,5 @@
 # minmax.m4 serial 4
-dnl Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mkdtemp.m4 b/gettext-tools/gnulib-m4/mkdtemp.m4
index fb3182d..a2edd39 100644
--- a/gettext-tools/gnulib-m4/mkdtemp.m4
+++ b/gettext-tools/gnulib-m4/mkdtemp.m4
@@ -1,5 +1,5 @@
 # mkdtemp.m4 serial 8
-dnl Copyright (C) 2001-2003, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2001-2003, 2006-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/mmap-anon.m4 b/gettext-tools/gnulib-m4/mmap-anon.m4
index 92a88d0..853c89d 100644
--- a/gettext-tools/gnulib-m4/mmap-anon.m4
+++ b/gettext-tools/gnulib-m4/mmap-anon.m4
@@ -1,5 +1,5 @@
 # mmap-anon.m4 serial 10
-dnl Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/mode_t.m4 b/gettext-tools/gnulib-m4/mode_t.m4
index 01badba..0cd40db 100644
--- a/gettext-tools/gnulib-m4/mode_t.m4
+++ b/gettext-tools/gnulib-m4/mode_t.m4
@@ -1,5 +1,5 @@
 # mode_t.m4 serial 2
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/moo.m4 b/gettext-tools/gnulib-m4/moo.m4
index 3bda672..88e66a9 100644
--- a/gettext-tools/gnulib-m4/moo.m4
+++ b/gettext-tools/gnulib-m4/moo.m4
@@ -1,5 +1,5 @@
 # moo.m4 serial 1 (gettext-0.17)
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/msvc-inval.m4 b/gettext-tools/gnulib-m4/msvc-inval.m4
index 9446fa5..f5e4c89 100644
--- a/gettext-tools/gnulib-m4/msvc-inval.m4
+++ b/gettext-tools/gnulib-m4/msvc-inval.m4
@@ -1,5 +1,5 @@
 # msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/msvc-nothrow.m4 b/gettext-tools/gnulib-m4/msvc-nothrow.m4
index 5d72a04..58f5c0b 100644
--- a/gettext-tools/gnulib-m4/msvc-nothrow.m4
+++ b/gettext-tools/gnulib-m4/msvc-nothrow.m4
@@ -1,5 +1,5 @@
 # msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/multiarch.m4 b/gettext-tools/gnulib-m4/multiarch.m4
index fc575c1..43b5d05 100644
--- a/gettext-tools/gnulib-m4/multiarch.m4
+++ b/gettext-tools/gnulib-m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 7
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/no-c++.m4 b/gettext-tools/gnulib-m4/no-c++.m4
index edc5246..6442e59 100644
--- a/gettext-tools/gnulib-m4/no-c++.m4
+++ b/gettext-tools/gnulib-m4/no-c++.m4
@@ -1,5 +1,5 @@
 # no-c++.m4 serial 1
-dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/nocrash.m4 b/gettext-tools/gnulib-m4/nocrash.m4
index 5628318..d8dd8f1 100644
--- a/gettext-tools/gnulib-m4/nocrash.m4
+++ b/gettext-tools/gnulib-m4/nocrash.m4
@@ -1,5 +1,5 @@
 # nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -110,11 +110,12 @@ nocrash_init (void)
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
+#include <unistd.h>
 /* A POSIX signal handler.  */
 static void
 exception_handler (int sig)
 {
-  exit (1);
+  _exit (1);
 }
 static void
 nocrash_init (void)
diff --git a/gettext-tools/gnulib-m4/obstack.m4 b/gettext-tools/gnulib-m4/obstack.m4
index 9213921..98ca5f9 100644
--- a/gettext-tools/gnulib-m4/obstack.m4
+++ b/gettext-tools/gnulib-m4/obstack.m4
@@ -1,6 +1,6 @@
 # See if we need to provide obstacks.
 
-dnl Copyright 1996-2015 Free Software Foundation, Inc.
+dnl Copyright 1996-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/off_t.m4 b/gettext-tools/gnulib-m4/off_t.m4
index 0eb1467..282751b 100644
--- a/gettext-tools/gnulib-m4/off_t.m4
+++ b/gettext-tools/gnulib-m4/off_t.m4
@@ -1,5 +1,5 @@
 # off_t.m4 serial 1
-dnl Copyright (C) 2012-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/open.m4 b/gettext-tools/gnulib-m4/open.m4
index 2accbaa..53d3038 100644
--- a/gettext-tools/gnulib-m4/open.m4
+++ b/gettext-tools/gnulib-m4/open.m4
@@ -1,5 +1,5 @@
 # open.m4 serial 14
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/opendir.m4 b/gettext-tools/gnulib-m4/opendir.m4
index cd83706..ffaa6ae 100644
--- a/gettext-tools/gnulib-m4/opendir.m4
+++ b/gettext-tools/gnulib-m4/opendir.m4
@@ -1,5 +1,5 @@
-# opendir.m4 serial 2
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# opendir.m4 serial 4
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -22,4 +22,10 @@ AC_DEFUN([gl_FUNC_OPENDIR],
       fi
     fi
   ])
+  dnl Replace opendir() on OS/2 kLIBC to support dirfd() function replaced
+  dnl by gnulib.
+  case $host_os,$HAVE_OPENDIR in
+    os2*,1)
+      REPLACE_OPENDIR=1;;
+  esac
 ])
diff --git a/gettext-tools/gnulib-m4/pathmax.m4 b/gettext-tools/gnulib-m4/pathmax.m4
index 0e3db7a..6f8e59a 100644
--- a/gettext-tools/gnulib-m4/pathmax.m4
+++ b/gettext-tools/gnulib-m4/pathmax.m4
@@ -1,5 +1,5 @@
 # pathmax.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/pipe2.m4 b/gettext-tools/gnulib-m4/pipe2.m4
index 0b64651..c09fcee 100644
--- a/gettext-tools/gnulib-m4/pipe2.m4
+++ b/gettext-tools/gnulib-m4/pipe2.m4
@@ -1,5 +1,5 @@
 # pipe2.m4 serial 2
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/posix_spawn.m4 b/gettext-tools/gnulib-m4/posix_spawn.m4
index f3ce331..c0418c4 100644
--- a/gettext-tools/gnulib-m4/posix_spawn.m4
+++ b/gettext-tools/gnulib-m4/posix_spawn.m4
@@ -1,5 +1,5 @@
 # posix_spawn.m4 serial 11
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/pow.m4 b/gettext-tools/gnulib-m4/pow.m4
index 86428d1..ebdbdb5 100644
--- a/gettext-tools/gnulib-m4/pow.m4
+++ b/gettext-tools/gnulib-m4/pow.m4
@@ -1,5 +1,5 @@
 # pow.m4 serial 1
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/printf.m4 b/gettext-tools/gnulib-m4/printf.m4
index d06746a..e495e0c 100644
--- a/gettext-tools/gnulib-m4/printf.m4
+++ b/gettext-tools/gnulib-m4/printf.m4
@@ -1,5 +1,5 @@
 # printf.m4 serial 52
-dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/putenv.m4 b/gettext-tools/gnulib-m4/putenv.m4
index 73a5f46..c3c30d8 100644
--- a/gettext-tools/gnulib-m4/putenv.m4
+++ b/gettext-tools/gnulib-m4/putenv.m4
@@ -1,5 +1,5 @@
 # putenv.m4 serial 20
-dnl Copyright (C) 2002-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/quote.m4 b/gettext-tools/gnulib-m4/quote.m4
index af72e96..50894f8 100644
--- a/gettext-tools/gnulib-m4/quote.m4
+++ b/gettext-tools/gnulib-m4/quote.m4
@@ -1,5 +1,5 @@
 # quote.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/quotearg.m4 b/gettext-tools/gnulib-m4/quotearg.m4
index 985b30d..2562375 100644
--- a/gettext-tools/gnulib-m4/quotearg.m4
+++ b/gettext-tools/gnulib-m4/quotearg.m4
@@ -1,5 +1,5 @@
 # quotearg.m4 serial 9
-dnl Copyright (C) 2002, 2004-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/raise.m4 b/gettext-tools/gnulib-m4/raise.m4
index ed6aae0..71c1f4c 100644
--- a/gettext-tools/gnulib-m4/raise.m4
+++ b/gettext-tools/gnulib-m4/raise.m4
@@ -1,5 +1,5 @@
 # raise.m4 serial 3
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/rawmemchr.m4 b/gettext-tools/gnulib-m4/rawmemchr.m4
index 88e815e..d3ccb7e 100644
--- a/gettext-tools/gnulib-m4/rawmemchr.m4
+++ b/gettext-tools/gnulib-m4/rawmemchr.m4
@@ -1,5 +1,5 @@
 # rawmemchr.m4 serial 2
-dnl Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/read-file.m4 b/gettext-tools/gnulib-m4/read-file.m4
index 67e50bd..aa23b58 100644
--- a/gettext-tools/gnulib-m4/read-file.m4
+++ b/gettext-tools/gnulib-m4/read-file.m4
@@ -1,5 +1,5 @@
 # read-file.m4 serial 3
-dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/read.m4 b/gettext-tools/gnulib-m4/read.m4
index 9fdd7df..5a18c11 100644
--- a/gettext-tools/gnulib-m4/read.m4
+++ b/gettext-tools/gnulib-m4/read.m4
@@ -1,5 +1,5 @@
 # read.m4 serial 4
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/readdir.m4 b/gettext-tools/gnulib-m4/readdir.m4
index 8aa348f..eda3acf 100644
--- a/gettext-tools/gnulib-m4/readdir.m4
+++ b/gettext-tools/gnulib-m4/readdir.m4
@@ -1,5 +1,5 @@
 # readdir.m4 serial 1
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/readlink.m4 b/gettext-tools/gnulib-m4/readlink.m4
index 88c9bfe..ede0378 100644
--- a/gettext-tools/gnulib-m4/readlink.m4
+++ b/gettext-tools/gnulib-m4/readlink.m4
@@ -1,5 +1,5 @@
 # readlink.m4 serial 12
-dnl Copyright (C) 2003, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/realloc.m4 b/gettext-tools/gnulib-m4/realloc.m4
index 0e1d338..fc22825 100644
--- a/gettext-tools/gnulib-m4/realloc.m4
+++ b/gettext-tools/gnulib-m4/realloc.m4
@@ -1,13 +1,13 @@
-# realloc.m4 serial 13
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+# realloc.m4 serial 14
+dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 m4_version_prereq([2.70], [] ,[
 
-# This is taken from the following Autoconf patch:
-# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9
+# This is adapted with modifications from upstream Autoconf here:
+# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c
 AC_DEFUN([_AC_FUNC_REALLOC_IF],
 [
   AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -23,7 +23,10 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF],
             char *realloc ();
             #endif
           ]],
-          [[return ! realloc (0, 0);]])
+          [[char *p = realloc (0, 0);
+            int result = !p;
+            free (p);
+            return result;]])
        ],
        [ac_cv_func_realloc_0_nonnull=yes],
        [ac_cv_func_realloc_0_nonnull=no],
diff --git a/gettext-tools/gnulib-m4/relocatable-lib.m4 b/gettext-tools/gnulib-m4/relocatable-lib.m4
index 889e099..011c62b 100644
--- a/gettext-tools/gnulib-m4/relocatable-lib.m4
+++ b/gettext-tools/gnulib-m4/relocatable-lib.m4
@@ -1,5 +1,5 @@
 # relocatable-lib.m4 serial 6
-dnl Copyright (C) 2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/relocatable.m4 b/gettext-tools/gnulib-m4/relocatable.m4
index a4bf06f..f939ded 100644
--- a/gettext-tools/gnulib-m4/relocatable.m4
+++ b/gettext-tools/gnulib-m4/relocatable.m4
@@ -1,5 +1,5 @@
 # relocatable.m4 serial 18
-dnl Copyright (C) 2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/rmdir.m4 b/gettext-tools/gnulib-m4/rmdir.m4
index 09ed159..ebb3b5d 100644
--- a/gettext-tools/gnulib-m4/rmdir.m4
+++ b/gettext-tools/gnulib-m4/rmdir.m4
@@ -1,5 +1,5 @@
 # rmdir.m4 serial 13
-dnl Copyright (C) 2002, 2005, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/safe-read.m4 b/gettext-tools/gnulib-m4/safe-read.m4
index 697a07c..2221682 100644
--- a/gettext-tools/gnulib-m4/safe-read.m4
+++ b/gettext-tools/gnulib-m4/safe-read.m4
@@ -1,5 +1,5 @@
 # safe-read.m4 serial 6
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/safe-write.m4 b/gettext-tools/gnulib-m4/safe-write.m4
index 1cef87c..a99fb1f 100644
--- a/gettext-tools/gnulib-m4/safe-write.m4
+++ b/gettext-tools/gnulib-m4/safe-write.m4
@@ -1,5 +1,5 @@
 # safe-write.m4 serial 4
-dnl Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sched_h.m4 b/gettext-tools/gnulib-m4/sched_h.m4
index 0cbf2d2..f564541 100644
--- a/gettext-tools/gnulib-m4/sched_h.m4
+++ b/gettext-tools/gnulib-m4/sched_h.m4
@@ -1,5 +1,5 @@
 # sched_h.m4 serial 7
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/secure_getenv.m4 b/gettext-tools/gnulib-m4/secure_getenv.m4
index 6afe89f..00194c8 100644
--- a/gettext-tools/gnulib-m4/secure_getenv.m4
+++ b/gettext-tools/gnulib-m4/secure_getenv.m4
@@ -1,5 +1,5 @@
 # Look up an environment variable more securely.
-dnl Copyright 2013-2015 Free Software Foundation, Inc.
+dnl Copyright 2013-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/setenv.m4 b/gettext-tools/gnulib-m4/setenv.m4
index 3aa38d8..5d49aba 100644
--- a/gettext-tools/gnulib-m4/setenv.m4
+++ b/gettext-tools/gnulib-m4/setenv.m4
@@ -1,5 +1,5 @@
 # setenv.m4 serial 26
-dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/setlocale.m4 b/gettext-tools/gnulib-m4/setlocale.m4
index 6d153f9..a359069 100644
--- a/gettext-tools/gnulib-m4/setlocale.m4
+++ b/gettext-tools/gnulib-m4/setlocale.m4
@@ -1,5 +1,5 @@
 # setlocale.m4 serial 4
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sig_atomic_t.m4 b/gettext-tools/gnulib-m4/sig_atomic_t.m4
index f796112..f1e2e59 100644
--- a/gettext-tools/gnulib-m4/sig_atomic_t.m4
+++ b/gettext-tools/gnulib-m4/sig_atomic_t.m4
@@ -1,5 +1,5 @@
 # sig_atomic_t.m4 serial 3
-dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sigaction.m4 b/gettext-tools/gnulib-m4/sigaction.m4
index 98a32b2..9b43764 100644
--- a/gettext-tools/gnulib-m4/sigaction.m4
+++ b/gettext-tools/gnulib-m4/sigaction.m4
@@ -1,5 +1,5 @@
 # sigaction.m4 serial 7
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/signal_h.m4 b/gettext-tools/gnulib-m4/signal_h.m4
index f737c36..bcfd7b4 100644
--- a/gettext-tools/gnulib-m4/signal_h.m4
+++ b/gettext-tools/gnulib-m4/signal_h.m4
@@ -1,5 +1,5 @@
 # signal_h.m4 serial 18
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/signalblocking.m4 b/gettext-tools/gnulib-m4/signalblocking.m4
index 7eeaf54..5197c50 100644
--- a/gettext-tools/gnulib-m4/signalblocking.m4
+++ b/gettext-tools/gnulib-m4/signalblocking.m4
@@ -1,5 +1,5 @@
 # signalblocking.m4 serial 14
-dnl Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/signbit.m4 b/gettext-tools/gnulib-m4/signbit.m4
index 21b9bf5..e42f183 100644
--- a/gettext-tools/gnulib-m4/signbit.m4
+++ b/gettext-tools/gnulib-m4/signbit.m4
@@ -1,5 +1,5 @@
 # signbit.m4 serial 13
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sigpipe.m4 b/gettext-tools/gnulib-m4/sigpipe.m4
index 5850090..90f8ef1 100644
--- a/gettext-tools/gnulib-m4/sigpipe.m4
+++ b/gettext-tools/gnulib-m4/sigpipe.m4
@@ -1,5 +1,5 @@
 # sigpipe.m4 serial 2
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sleep.m4 b/gettext-tools/gnulib-m4/sleep.m4
index b789ac5..99de5ee 100644
--- a/gettext-tools/gnulib-m4/sleep.m4
+++ b/gettext-tools/gnulib-m4/sleep.m4
@@ -1,5 +1,5 @@
 # sleep.m4 serial 7
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/snprintf.m4 b/gettext-tools/gnulib-m4/snprintf.m4
index 8ae7005..f876b55 100644
--- a/gettext-tools/gnulib-m4/snprintf.m4
+++ b/gettext-tools/gnulib-m4/snprintf.m4
@@ -1,5 +1,5 @@
 # snprintf.m4 serial 6
-dnl Copyright (C) 2002-2004, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/spawn-pipe.m4 b/gettext-tools/gnulib-m4/spawn-pipe.m4
index f541e8e..efc34a8 100644
--- a/gettext-tools/gnulib-m4/spawn-pipe.m4
+++ b/gettext-tools/gnulib-m4/spawn-pipe.m4
@@ -1,5 +1,5 @@
 # spawn-pipe.m4 serial 2
-dnl Copyright (C) 2004, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/spawn_h.m4 b/gettext-tools/gnulib-m4/spawn_h.m4
index 593b2df..94e4ca1 100644
--- a/gettext-tools/gnulib-m4/spawn_h.m4
+++ b/gettext-tools/gnulib-m4/spawn_h.m4
@@ -1,5 +1,5 @@
 # spawn_h.m4 serial 16
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/ssize_t.m4 b/gettext-tools/gnulib-m4/ssize_t.m4
index 25bd451..3e7b9e6 100644
--- a/gettext-tools/gnulib-m4/ssize_t.m4
+++ b/gettext-tools/gnulib-m4/ssize_t.m4
@@ -1,5 +1,5 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/stat.m4 b/gettext-tools/gnulib-m4/stat.m4
index d1b3768..a794975 100644
--- a/gettext-tools/gnulib-m4/stat.m4
+++ b/gettext-tools/gnulib-m4/stat.m4
@@ -1,6 +1,6 @@
 # serial 11
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/stdalign.m4 b/gettext-tools/gnulib-m4/stdalign.m4
index 033b0d3..49980cd 100644
--- a/gettext-tools/gnulib-m4/stdalign.m4
+++ b/gettext-tools/gnulib-m4/stdalign.m4
@@ -1,6 +1,6 @@
 # Check for stdalign.h that conforms to C11.
 
-dnl Copyright 2011-2015 Free Software Foundation, Inc.
+dnl Copyright 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/stdarg.m4 b/gettext-tools/gnulib-m4/stdarg.m4
index d208eb3..ab3e7f5 100644
--- a/gettext-tools/gnulib-m4/stdarg.m4
+++ b/gettext-tools/gnulib-m4/stdarg.m4
@@ -1,5 +1,5 @@
 # stdarg.m4 serial 6
-dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/stdbool.m4 b/gettext-tools/gnulib-m4/stdbool.m4
index 7273b82..625520f 100644
--- a/gettext-tools/gnulib-m4/stdbool.m4
+++ b/gettext-tools/gnulib-m4/stdbool.m4
@@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/stddef_h.m4 b/gettext-tools/gnulib-m4/stddef_h.m4
index 2310502..c045c65 100644
--- a/gettext-tools/gnulib-m4/stddef_h.m4
+++ b/gettext-tools/gnulib-m4/stddef_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for <stddef.h>, for platforms that have issues.
 # stddef_h.m4 serial 5
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/stdint.m4 b/gettext-tools/gnulib-m4/stdint.m4
index 4011a49..0b4b906 100644
--- a/gettext-tools/gnulib-m4/stdint.m4
+++ b/gettext-tools/gnulib-m4/stdint.m4
@@ -1,5 +1,5 @@
-# stdint.m4 serial 43
-dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# stdint.m4 serial 44
+dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -70,6 +70,8 @@ AC_DEFUN_ONCE([gl_STDINT_H],
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([[
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
 #if !(defined WCHAR_MIN && defined WCHAR_MAX)
@@ -218,6 +220,8 @@ struct s {
           AC_RUN_IFELSE([
             AC_LANG_PROGRAM([[
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 ]
 gl_STDINT_INCLUDES
@@ -279,6 +283,29 @@ static const char *macro_values[] =
       ])
   fi
   if test "$gl_cv_header_working_stdint_h" = yes; then
+    dnl Now see whether the system <stdint.h> works without
+    dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined.
+    AC_CACHE_CHECK([whether stdint.h predates C++11],
+      [gl_cv_header_stdint_predates_cxx11_h],
+      [gl_cv_header_stdint_predates_cxx11_h=yes
+       AC_COMPILE_IFELSE([
+	 AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+]
+gl_STDINT_INCLUDES
+[
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+         ]])],
+         [gl_cv_header_stdint_predates_cxx11_h=no])])
+
+    if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+      AC_DEFINE([__STDC_CONSTANT_MACROS], [1],
+                [Define to 1 if the system <stdint.h> predates C++11.])
+      AC_DEFINE([__STDC_LIMIT_MACROS], [1],
+                [Define to 1 if the system <stdint.h> predates C++11.])
+    fi
     STDINT_H=
   else
     dnl Check for <sys/inttypes.h>, and for
diff --git a/gettext-tools/gnulib-m4/stdio_h.m4 b/gettext-tools/gnulib-m4/stdio_h.m4
index f60cc21..0e38758 100644
--- a/gettext-tools/gnulib-m4/stdio_h.m4
+++ b/gettext-tools/gnulib-m4/stdio_h.m4
@@ -1,5 +1,5 @@
 # stdio_h.m4 serial 46
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/stdlib_h.m4 b/gettext-tools/gnulib-m4/stdlib_h.m4
index 0b4c623..19107c4 100644
--- a/gettext-tools/gnulib-m4/stdlib_h.m4
+++ b/gettext-tools/gnulib-m4/stdlib_h.m4
@@ -1,5 +1,5 @@
 # stdlib_h.m4 serial 42
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/stpcpy.m4 b/gettext-tools/gnulib-m4/stpcpy.m4
index 7e28bee..70bbfd8 100644
--- a/gettext-tools/gnulib-m4/stpcpy.m4
+++ b/gettext-tools/gnulib-m4/stpcpy.m4
@@ -1,5 +1,5 @@
 # stpcpy.m4 serial 8
-dnl Copyright (C) 2002, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/stpncpy.m4 b/gettext-tools/gnulib-m4/stpncpy.m4
index 7c4617b..ea1089b 100644
--- a/gettext-tools/gnulib-m4/stpncpy.m4
+++ b/gettext-tools/gnulib-m4/stpncpy.m4
@@ -1,5 +1,5 @@
 # stpncpy.m4 serial 16
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/strchrnul.m4 b/gettext-tools/gnulib-m4/strchrnul.m4
index 8c3d4cf..ac5c211 100644
--- a/gettext-tools/gnulib-m4/strchrnul.m4
+++ b/gettext-tools/gnulib-m4/strchrnul.m4
@@ -1,5 +1,5 @@
 # strchrnul.m4 serial 9
-dnl Copyright (C) 2003, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/strcspn.m4 b/gettext-tools/gnulib-m4/strcspn.m4
index 912eb0f..a4d8769 100644
--- a/gettext-tools/gnulib-m4/strcspn.m4
+++ b/gettext-tools/gnulib-m4/strcspn.m4
@@ -1,5 +1,5 @@
 # strcspn.m4 serial 4
-dnl Copyright (C) 2002-2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/strerror.m4 b/gettext-tools/gnulib-m4/strerror.m4
index 75a17f2..e286594 100644
--- a/gettext-tools/gnulib-m4/strerror.m4
+++ b/gettext-tools/gnulib-m4/strerror.m4
@@ -1,5 +1,5 @@
 # strerror.m4 serial 17
-dnl Copyright (C) 2002, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/string_h.m4 b/gettext-tools/gnulib-m4/string_h.m4
index 55d09ef..0c5ec6f 100644
--- a/gettext-tools/gnulib-m4/string_h.m4
+++ b/gettext-tools/gnulib-m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/strnlen.m4 b/gettext-tools/gnulib-m4/strnlen.m4
index 5f85d3f..67b3859 100644
--- a/gettext-tools/gnulib-m4/strnlen.m4
+++ b/gettext-tools/gnulib-m4/strnlen.m4
@@ -1,5 +1,5 @@
 # strnlen.m4 serial 13
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/strpbrk.m4 b/gettext-tools/gnulib-m4/strpbrk.m4
index 1350a0c..778fd26 100644
--- a/gettext-tools/gnulib-m4/strpbrk.m4
+++ b/gettext-tools/gnulib-m4/strpbrk.m4
@@ -1,5 +1,5 @@
 # strpbrk.m4 serial 6
-dnl Copyright (C) 2002-2003, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/strstr.m4 b/gettext-tools/gnulib-m4/strstr.m4
index 040c0b9..77db2a4 100644
--- a/gettext-tools/gnulib-m4/strstr.m4
+++ b/gettext-tools/gnulib-m4/strstr.m4
@@ -1,5 +1,5 @@
 # strstr.m4 serial 16
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -71,7 +71,7 @@ AC_DEFUN([gl_FUNC_STRSTR],
 #include <string.h> /* for strstr */
 #include <stdlib.h> /* for malloc */
 #include <unistd.h> /* for alarm */
-static void quit (int sig) { exit (sig + 128); }
+static void quit (int sig) { _exit (sig + 128); }
 ]], [[
     int result = 0;
     size_t m = 1000000;
diff --git a/gettext-tools/gnulib-m4/strtol.m4 b/gettext-tools/gnulib-m4/strtol.m4
index e100efd..fc72b3c 100644
--- a/gettext-tools/gnulib-m4/strtol.m4
+++ b/gettext-tools/gnulib-m4/strtol.m4
@@ -1,5 +1,5 @@
 # strtol.m4 serial 6
-dnl Copyright (C) 2002-2003, 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/strtoul.m4 b/gettext-tools/gnulib-m4/strtoul.m4
index 5ae76dd..a28aff1 100644
--- a/gettext-tools/gnulib-m4/strtoul.m4
+++ b/gettext-tools/gnulib-m4/strtoul.m4
@@ -1,5 +1,5 @@
 # strtoul.m4 serial 5
-dnl Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/symlink.m4 b/gettext-tools/gnulib-m4/symlink.m4
index a59e2f0..d15d915 100644
--- a/gettext-tools/gnulib-m4/symlink.m4
+++ b/gettext-tools/gnulib-m4/symlink.m4
@@ -1,7 +1,7 @@
 # serial 6
 # See if we need to provide symlink replacement.
 
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sys_select_h.m4 b/gettext-tools/gnulib-m4/sys_select_h.m4
index 5ec5919..23526e5 100644
--- a/gettext-tools/gnulib-m4/sys_select_h.m4
+++ b/gettext-tools/gnulib-m4/sys_select_h.m4
@@ -1,5 +1,5 @@
 # sys_select_h.m4 serial 20
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sys_socket_h.m4 b/gettext-tools/gnulib-m4/sys_socket_h.m4
index eaeabe7..ae500c7 100644
--- a/gettext-tools/gnulib-m4/sys_socket_h.m4
+++ b/gettext-tools/gnulib-m4/sys_socket_h.m4
@@ -1,5 +1,5 @@
 # sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sys_stat_h.m4 b/gettext-tools/gnulib-m4/sys_stat_h.m4
index 6c909e8..3d43b6f 100644
--- a/gettext-tools/gnulib-m4/sys_stat_h.m4
+++ b/gettext-tools/gnulib-m4/sys_stat_h.m4
@@ -1,5 +1,5 @@
 # sys_stat_h.m4 serial 28   -*- Autoconf -*-
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sys_time_h.m4 b/gettext-tools/gnulib-m4/sys_time_h.m4
index 28c8b1a..3061a9c 100644
--- a/gettext-tools/gnulib-m4/sys_time_h.m4
+++ b/gettext-tools/gnulib-m4/sys_time_h.m4
@@ -1,7 +1,7 @@
 # Configure a replacement for <sys/time.h>.
 # serial 8
 
-# Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sys_types_h.m4 b/gettext-tools/gnulib-m4/sys_types_h.m4
index 2232aec..b0aabb4 100644
--- a/gettext-tools/gnulib-m4/sys_types_h.m4
+++ b/gettext-tools/gnulib-m4/sys_types_h.m4
@@ -1,5 +1,5 @@
 # sys_types_h.m4 serial 5
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/sys_wait_h.m4 b/gettext-tools/gnulib-m4/sys_wait_h.m4
index ae0a3b3..69ca429 100644
--- a/gettext-tools/gnulib-m4/sys_wait_h.m4
+++ b/gettext-tools/gnulib-m4/sys_wait_h.m4
@@ -1,5 +1,5 @@
 # sys_wait_h.m4 serial 6
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/tempname.m4 b/gettext-tools/gnulib-m4/tempname.m4
index b1694d6..acf4c8d 100644
--- a/gettext-tools/gnulib-m4/tempname.m4
+++ b/gettext-tools/gnulib-m4/tempname.m4
@@ -1,6 +1,6 @@
 #serial 5
 
-# Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007, 2009-2016 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/term-ostream.m4 b/gettext-tools/gnulib-m4/term-ostream.m4
index c227384..bcc931e 100644
--- a/gettext-tools/gnulib-m4/term-ostream.m4
+++ b/gettext-tools/gnulib-m4/term-ostream.m4
@@ -1,5 +1,5 @@
 # term-ostream.m4 serial 1
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/terminfo.m4 b/gettext-tools/gnulib-m4/terminfo.m4
index 070e86e..8257e25 100644
--- a/gettext-tools/gnulib-m4/terminfo.m4
+++ b/gettext-tools/gnulib-m4/terminfo.m4
@@ -1,5 +1,5 @@
 # terminfo.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006, 2008, 2015 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2006, 2008, 2015-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/thread.m4 b/gettext-tools/gnulib-m4/thread.m4
index 5945126..7a9d776 100644
--- a/gettext-tools/gnulib-m4/thread.m4
+++ b/gettext-tools/gnulib-m4/thread.m4
@@ -1,5 +1,5 @@
 # thread.m4 serial 3
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/time_h.m4 b/gettext-tools/gnulib-m4/time_h.m4
index 754b469..eb2a631 100644
--- a/gettext-tools/gnulib-m4/time_h.m4
+++ b/gettext-tools/gnulib-m4/time_h.m4
@@ -1,6 +1,6 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc.
 
 # serial 9
 
diff --git a/gettext-tools/gnulib-m4/tls.m4 b/gettext-tools/gnulib-m4/tls.m4
index 9c146bd..87a3d49 100644
--- a/gettext-tools/gnulib-m4/tls.m4
+++ b/gettext-tools/gnulib-m4/tls.m4
@@ -1,5 +1,5 @@
 # tls.m4 serial 2 (gettext-0.18)
-dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/tmpdir.m4 b/gettext-tools/gnulib-m4/tmpdir.m4
index 3f91881..6c8dc1d 100644
--- a/gettext-tools/gnulib-m4/tmpdir.m4
+++ b/gettext-tools/gnulib-m4/tmpdir.m4
@@ -1,5 +1,5 @@
 # tmpdir.m4 serial 4
-dnl Copyright (C) 2001-2002, 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2002, 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/ungetc.m4 b/gettext-tools/gnulib-m4/ungetc.m4
index 2a34b30..e5d10eb 100644
--- a/gettext-tools/gnulib-m4/ungetc.m4
+++ b/gettext-tools/gnulib-m4/ungetc.m4
@@ -1,5 +1,5 @@
 # ungetc.m4 serial 3
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/unionwait.m4 b/gettext-tools/gnulib-m4/unionwait.m4
index 4ec7bf3..95199f3 100644
--- a/gettext-tools/gnulib-m4/unionwait.m4
+++ b/gettext-tools/gnulib-m4/unionwait.m4
@@ -1,5 +1,5 @@
 # unionwait.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1993-2002, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1993-2002, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/unistd-safer.m4 b/gettext-tools/gnulib-m4/unistd-safer.m4
index 006bba2..ceb5cc6 100644
--- a/gettext-tools/gnulib-m4/unistd-safer.m4
+++ b/gettext-tools/gnulib-m4/unistd-safer.m4
@@ -1,5 +1,5 @@
 #serial 9
-dnl Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/unistd_h.m4 b/gettext-tools/gnulib-m4/unistd_h.m4
index b3c581f..544dadb 100644
--- a/gettext-tools/gnulib-m4/unistd_h.m4
+++ b/gettext-tools/gnulib-m4/unistd_h.m4
@@ -1,5 +1,5 @@
 # unistd_h.m4 serial 68
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/unlocked-io.m4 b/gettext-tools/gnulib-m4/unlocked-io.m4
index e5a6f43..c29ec20 100644
--- a/gettext-tools/gnulib-m4/unlocked-io.m4
+++ b/gettext-tools/gnulib-m4/unlocked-io.m4
@@ -1,6 +1,6 @@
 # unlocked-io.m4 serial 15
 
-# Copyright (C) 1998-2006, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2006, 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/vasnprintf.m4 b/gettext-tools/gnulib-m4/vasnprintf.m4
index 4708f2b..2d4b463 100644
--- a/gettext-tools/gnulib-m4/vasnprintf.m4
+++ b/gettext-tools/gnulib-m4/vasnprintf.m4
@@ -1,5 +1,5 @@
 # vasnprintf.m4 serial 36
-dnl Copyright (C) 2002-2004, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/vasprintf.m4 b/gettext-tools/gnulib-m4/vasprintf.m4
index b785dc3..d7866b1 100644
--- a/gettext-tools/gnulib-m4/vasprintf.m4
+++ b/gettext-tools/gnulib-m4/vasprintf.m4
@@ -1,5 +1,5 @@
 # vasprintf.m4 serial 6
-dnl Copyright (C) 2002-2003, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006-2007, 2009-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/gnulib-m4/vsnprintf.m4 b/gettext-tools/gnulib-m4/vsnprintf.m4
index 28be6fd..e056f05 100644
--- a/gettext-tools/gnulib-m4/vsnprintf.m4
+++ b/gettext-tools/gnulib-m4/vsnprintf.m4
@@ -1,5 +1,5 @@
 # vsnprintf.m4 serial 6
-dnl Copyright (C) 2002-2004, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/wait-process.m4 b/gettext-tools/gnulib-m4/wait-process.m4
index 4a8a3a1..1c60e51 100644
--- a/gettext-tools/gnulib-m4/wait-process.m4
+++ b/gettext-tools/gnulib-m4/wait-process.m4
@@ -1,5 +1,5 @@
 # wait-process.m4 serial 6
-dnl Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/waitpid.m4 b/gettext-tools/gnulib-m4/waitpid.m4
index 535a708..5680dca 100644
--- a/gettext-tools/gnulib-m4/waitpid.m4
+++ b/gettext-tools/gnulib-m4/waitpid.m4
@@ -1,5 +1,5 @@
 # waitpid.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/warn-on-use.m4 b/gettext-tools/gnulib-m4/warn-on-use.m4
index 1e98dc9..08440ec 100644
--- a/gettext-tools/gnulib-m4/warn-on-use.m4
+++ b/gettext-tools/gnulib-m4/warn-on-use.m4
@@ -1,5 +1,5 @@
 # warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/wchar_h.m4 b/gettext-tools/gnulib-m4/wchar_h.m4
index 9d1b0f8..b40b732 100644
--- a/gettext-tools/gnulib-m4/wchar_h.m4
+++ b/gettext-tools/gnulib-m4/wchar_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/wcrtomb.m4 b/gettext-tools/gnulib-m4/wcrtomb.m4
index 7e3fe3f..267b3c9 100644
--- a/gettext-tools/gnulib-m4/wcrtomb.m4
+++ b/gettext-tools/gnulib-m4/wcrtomb.m4
@@ -1,5 +1,5 @@
 # wcrtomb.m4 serial 11
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/wctob.m4 b/gettext-tools/gnulib-m4/wctob.m4
index 501dc4a..bdb5299 100644
--- a/gettext-tools/gnulib-m4/wctob.m4
+++ b/gettext-tools/gnulib-m4/wctob.m4
@@ -1,5 +1,5 @@
 # wctob.m4 serial 10
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/wctomb.m4 b/gettext-tools/gnulib-m4/wctomb.m4
index 05c6685..7c8b3ef 100644
--- a/gettext-tools/gnulib-m4/wctomb.m4
+++ b/gettext-tools/gnulib-m4/wctomb.m4
@@ -1,5 +1,5 @@
 # wctomb.m4 serial 2
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/wctype_h.m4 b/gettext-tools/gnulib-m4/wctype_h.m4
index 95a4705..accc001 100644
--- a/gettext-tools/gnulib-m4/wctype_h.m4
+++ b/gettext-tools/gnulib-m4/wctype_h.m4
@@ -2,7 +2,7 @@
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/wcwidth.m4 b/gettext-tools/gnulib-m4/wcwidth.m4
index b11dc8d..7a743c0 100644
--- a/gettext-tools/gnulib-m4/wcwidth.m4
+++ b/gettext-tools/gnulib-m4/wcwidth.m4
@@ -1,5 +1,5 @@
 # wcwidth.m4 serial 23
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -39,6 +39,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
     dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
     dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
     dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
+    dnl On OpenBSD 5.8, wcwidth(0xFF1A) (FULLWIDTH COLON) returns 0.
     dnl This leads to bugs in 'ls' (coreutils).
     AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
       [gl_cv_func_wcwidth_works],
@@ -74,6 +75,8 @@ int main ()
         result |= 2;
       if (wcwidth (0x200B) > 0)
         result |= 4;
+      if (wcwidth (0xFF1A) == 0)
+        result |= 8;
     }
   return result;
 }]])],
diff --git a/gettext-tools/gnulib-m4/write.m4 b/gettext-tools/gnulib-m4/write.m4
index ce7042e..d9b93f9 100644
--- a/gettext-tools/gnulib-m4/write.m4
+++ b/gettext-tools/gnulib-m4/write.m4
@@ -1,5 +1,5 @@
 # write.m4 serial 5
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/xvasprintf.m4 b/gettext-tools/gnulib-m4/xvasprintf.m4
index 715609a..dd01142 100644
--- a/gettext-tools/gnulib-m4/xvasprintf.m4
+++ b/gettext-tools/gnulib-m4/xvasprintf.m4
@@ -1,5 +1,5 @@
 # xvasprintf.m4 serial 2
-dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-m4/yield.m4 b/gettext-tools/gnulib-m4/yield.m4
index 4f24582..07f5f11 100644
--- a/gettext-tools/gnulib-m4/yield.m4
+++ b/gettext-tools/gnulib-m4/yield.m4
@@ -1,5 +1,5 @@
 # yield.m4 serial 2
-dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/gnulib-tests/Makefile.am b/gettext-tools/gnulib-tests/Makefile.am
index c94eb22..df62499 100644
--- a/gettext-tools/gnulib-tests/Makefile.am
+++ b/gettext-tools/gnulib-tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/gnulib-tests subdirectory of GNU gettext
-## Copyright (C) 2007, 2009-2010, 2015 Free Software Foundation, Inc.
+## Copyright (C) 2007, 2009-2010, 2015-2016 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
diff --git a/gettext-tools/gnulib-tests/Makefile.gnulib b/gettext-tools/gnulib-tests/Makefile.gnulib
index fe5d64b..1d1f294 100644
--- a/gettext-tools/gnulib-tests/Makefile.gnulib
+++ b/gettext-tools/gnulib-tests/Makefile.gnulib
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -834,6 +834,7 @@ EXTRA_DIST += test-math.c macros.h
 
 TESTS += \
   test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
+  test-mbrtowc5.sh \
   test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
   test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh
 TESTS_ENVIRONMENT += \
@@ -842,8 +843,7 @@ TESTS_ENVIRONMENT += \
   LOCALE_JA='@LOCALE_JA@' \
   LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbrtowc test-mbrtowc-w32
-
-EXTRA_DIST += test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc.c test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh test-mbrtowc-w32.c signature.h macros.h
+EXTRA_DIST += test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc.c test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh test-mbrtowc-w32-5.sh test-mbrtowc-w32.c signature.h macros.h
 
 ## end   gnulib module mbrtowc-tests
 
@@ -1789,6 +1789,11 @@ EXTRA_DIST += test-vasprintf.c signature.h macros.h
 TESTS_ENVIRONMENT += MAKE='$(MAKE)'
 TESTS += test-verify test-verify.sh
 check_PROGRAMS += test-verify
+
+# This test expects compilation of test-verify.c to fail, and
+# each time it fails, the makefile rule does not perform the usual
+#  "mv -f $name.Tpo $name.po, so tell make clean to remove that file.
+MOSTLYCLEANFILES += .deps/test-verify.Tpo
 EXTRA_DIST += test-verify.c test-verify.sh
 
 ## end   gnulib module verify-tests
@@ -1888,6 +1893,15 @@ EXTRA_DIST += test-xalloc-die.c test-xalloc-die.sh
 
 ## end   gnulib module xalloc-die-tests
 
+## begin gnulib module xmemdup0-tests
+
+TESTS += test-xmemdup0
+check_PROGRAMS += test-xmemdup0
+test_xmemdup0_LDADD = $(LDADD) @LIBINTL@
+EXTRA_DIST += test-xmemdup0.c macros.h
+
+## end   gnulib module xmemdup0-tests
+
 ## begin gnulib module xvasprintf-tests
 
 TESTS += test-xvasprintf
diff --git a/gettext-tools/gnulib-tests/Makefile.in b/gettext-tools/gnulib-tests/Makefile.in
index d369eeb..26becd9 100644
--- a/gettext-tools/gnulib-tests/Makefile.in
+++ b/gettext-tools/gnulib-tests/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -147,7 +147,7 @@ TESTS = test-set-mode-acl.sh test-set-mode-acl-1.sh \
 	test-log10$(EXEEXT) test-lseek.sh test-lstat$(EXEEXT) \
 	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
 	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
-	test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
+	test-mbrtowc5.sh test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
 	test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \
 	test-mbrtowc-w32-5.sh test-mbsinit.sh test-mbsrtowcs1.sh \
 	test-mbsrtowcs2.sh test-mbsrtowcs3.sh test-mbsrtowcs4.sh \
@@ -194,7 +194,7 @@ TESTS = test-set-mode-acl.sh test-set-mode-acl-1.sh \
 	test-wcrtomb-w32-3.sh test-wcrtomb-w32-4.sh \
 	test-wcrtomb-w32-5.sh test-wctype-h$(EXEEXT) \
 	test-wcwidth$(EXEEXT) test-write$(EXEEXT) test-xalloc-die.sh \
-	test-xvasprintf$(EXEEXT)
+	test-xmemdup0$(EXEEXT) test-xvasprintf$(EXEEXT)
 XFAIL_TESTS =
 noinst_PROGRAMS =
 check_PROGRAMS = test-set-mode-acl$(EXEEXT) test-copy-acl$(EXEEXT) \
@@ -278,7 +278,7 @@ check_PROGRAMS = test-set-mode-acl$(EXEEXT) test-copy-acl$(EXEEXT) \
 	test-wcrtomb$(EXEEXT) test-wcrtomb-w32$(EXEEXT) \
 	test-wctype-h$(EXEEXT) test-wcwidth$(EXEEXT) \
 	test-write$(EXEEXT) test-xalloc-die$(EXEEXT) \
-	test-xvasprintf$(EXEEXT)
+	test-xmemdup0$(EXEEXT) test-xvasprintf$(EXEEXT)
 @POSIX_SPAWN_PORTED_TRUE@am__append_1 = test-posix_spawn1 test-posix_spawn2
 @POSIX_SPAWN_PORTED_TRUE@am__append_2 = test-posix_spawn1 test-posix_spawn2
 @POSIX_SPAWN_PORTED_TRUE@am__append_3 = test-posix_spawn1.sh \
@@ -326,6 +326,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -362,6 +363,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
@@ -1421,6 +1423,9 @@ test_write_DEPENDENCIES = libtests.a ../gnulib-lib/libgettextlib.la \
 test_xalloc_die_SOURCES = test-xalloc-die.c
 test_xalloc_die_OBJECTS = test-xalloc-die.$(OBJEXT)
 test_xalloc_die_DEPENDENCIES = $(am__DEPENDENCIES_2)
+test_xmemdup0_SOURCES = test-xmemdup0.c
+test_xmemdup0_OBJECTS = test-xmemdup0.$(OBJEXT)
+test_xmemdup0_DEPENDENCIES = $(am__DEPENDENCIES_2)
 test_xvasprintf_SOURCES = test-xvasprintf.c
 test_xvasprintf_OBJECTS = test-xvasprintf.$(OBJEXT)
 test_xvasprintf_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -1512,7 +1517,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	test-vasnprintf.c test-vasprintf.c test-verify.c \
 	test-vsnprintf.c test-wchar.c test-wcrtomb.c \
 	test-wcrtomb-w32.c test-wctype-h.c test-wcwidth.c test-write.c \
-	test-xalloc-die.c test-xvasprintf.c
+	test-xalloc-die.c test-xmemdup0.c test-xvasprintf.c
 DIST_SOURCES = $(am__libtests_a_SOURCES_DIST) \
 	$(EXTRA_libtests_a_SOURCES) test-alignof.c test-alloca-opt.c \
 	test-areadlink.c test-argmatch.c test-array_list.c \
@@ -1568,7 +1573,7 @@ DIST_SOURCES = $(am__libtests_a_SOURCES_DIST) \
 	test-unsetenv.c test-vasnprintf.c test-vasprintf.c \
 	test-verify.c test-vsnprintf.c test-wchar.c test-wcrtomb.c \
 	test-wcrtomb-w32.c test-wctype-h.c test-wcwidth.c test-write.c \
-	test-xalloc-die.c test-xvasprintf.c
+	test-xalloc-die.c test-xmemdup0.c test-xvasprintf.c
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -3272,8 +3277,8 @@ EXTRA_DIST = test-set-mode-acl.sh test-set-mode-acl-1.sh \
 	lseek.c test-lseek.c test-lseek.sh signature.h macros.h \
 	test-lstat.h test-lstat.c signature.h macros.h test-malloca.c \
 	test-math.c macros.h test-mbrtowc1.sh test-mbrtowc2.sh \
-	test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc.c \
-	test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
+	test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc5.sh \
+	test-mbrtowc.c test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
 	test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \
 	test-mbrtowc-w32-5.sh test-mbrtowc-w32.c signature.h macros.h \
 	test-mbsinit.sh test-mbsinit.c signature.h macros.h \
@@ -3370,7 +3375,8 @@ EXTRA_DIST = test-set-mode-acl.sh test-set-mode-acl-1.sh \
 	signature.h macros.h wctob.c wctomb-impl.h wctomb.c \
 	test-wctype-h.c macros.h test-wcwidth.c signature.h macros.h \
 	test-write.c signature.h macros.h test-xalloc-die.c \
-	test-xalloc-die.sh test-xvasprintf.c macros.h
+	test-xalloc-die.sh test-xmemdup0.c macros.h test-xvasprintf.c \
+	macros.h
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
@@ -3389,11 +3395,16 @@ EXTRA_DIST = test-set-mode-acl.sh test-set-mode-acl-1.sh \
 BUILT_SOURCES = ctype.h inttypes.h $(am__append_3) arg-nonnull.h \
 	c++defs.h unused-parameter.h warn-on-use.h $(STDALIGN_H)
 SUFFIXES = 
+
+# This test expects compilation of test-verify.c to fail, and
+# each time it fails, the makefile rule does not perform the usual
+#  "mv -f $name.Tpo $name.po, so tell make clean to remove that file.
 MOSTLYCLEANFILES = core *.stackdump ctype.h ctype.h-t t-ftell3.tmp \
 	t-ftello3.tmp test-getdelim.txt test-getline.txt inttypes.h \
 	inttypes.h-t $(am__append_4) arg-nonnull.h arg-nonnull.h-t \
 	c++defs.h c++defs.h-t unused-parameter.h unused-parameter.h-t \
-	warn-on-use.h warn-on-use.h-t stdalign.h stdalign.h-t
+	warn-on-use.h warn-on-use.h-t stdalign.h stdalign.h-t \
+	.deps/test-verify.Tpo
 MOSTLYCLEANDIRS = 
 CLEANFILES = 
 DISTCLEANFILES = 
@@ -3487,6 +3498,7 @@ test_u8_strlen_LDADD = $(LDADD) $(LIBUNISTRING)
 test_u8_uctomb_SOURCES = unistr/test-u8-uctomb.c
 test_u8_uctomb_LDADD = $(LDADD) $(LIBUNISTRING)
 test_xalloc_die_LDADD = $(LDADD) @LIBINTL@
+test_xmemdup0_LDADD = $(LDADD) @LIBINTL@
 test_xvasprintf_LDADD = $(LDADD) @LIBINTL@
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -4307,6 +4319,10 @@ test-xalloc-die$(EXEEXT): $(test_xalloc_die_OBJECTS) $(test_xalloc_die_DEPENDENC
 	@rm -f test-xalloc-die$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xalloc_die_OBJECTS) $(test_xalloc_die_LDADD) $(LIBS)
 
+test-xmemdup0$(EXEEXT): $(test_xmemdup0_OBJECTS) $(test_xmemdup0_DEPENDENCIES) $(EXTRA_test_xmemdup0_DEPENDENCIES) 
+	@rm -f test-xmemdup0$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_xmemdup0_OBJECTS) $(test_xmemdup0_LDADD) $(LIBS)
+
 test-xvasprintf$(EXEEXT): $(test_xvasprintf_OBJECTS) $(test_xvasprintf_DEPENDENCIES) $(EXTRA_test_xvasprintf_DEPENDENCIES) 
 	@rm -f test-xvasprintf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_xvasprintf_OBJECTS) $(test_xvasprintf_LDADD) $(LIBS)
@@ -4498,6 +4514,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wcwidth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-write.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xalloc-die.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xmemdup0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-xvasprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctob.Po@am__quote@
@@ -5411,6 +5428,13 @@ test-mbrtowc4.sh.log: test-mbrtowc4.sh
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-mbrtowc5.sh.log: test-mbrtowc5.sh
+	@p='test-mbrtowc5.sh'; \
+	b='test-mbrtowc5.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-mbrtowc-w32-1.sh.log: test-mbrtowc-w32-1.sh
 	@p='test-mbrtowc-w32-1.sh'; \
 	b='test-mbrtowc-w32-1.sh'; \
@@ -6153,6 +6177,13 @@ test-xalloc-die.sh.log: test-xalloc-die.sh
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-xmemdup0.log: test-xmemdup0$(EXEEXT)
+	@p='test-xmemdup0$(EXEEXT)'; \
+	b='test-xmemdup0'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-xvasprintf.log: test-xvasprintf$(EXEEXT)
 	@p='test-xvasprintf$(EXEEXT)'; \
 	b='test-xvasprintf'; \
diff --git a/gettext-tools/gnulib-tests/btowc.c b/gettext-tools/gnulib-tests/btowc.c
index 2e32dee..e7badf9 100644
--- a/gettext-tools/gnulib-tests/btowc.c
+++ b/gettext-tools/gnulib-tests/btowc.c
@@ -1,5 +1,5 @@
 /* Convert unibyte character to wide character.
-   Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/ctype.in.h b/gettext-tools/gnulib-tests/ctype.in.h
index def19e9..217812d 100644
--- a/gettext-tools/gnulib-tests/ctype.in.h
+++ b/gettext-tools/gnulib-tests/ctype.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <ctype.h>, for platforms on which it is incomplete.
 
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/dup.c b/gettext-tools/gnulib-tests/dup.c
index 20f0453..034fcf8 100644
--- a/gettext-tools/gnulib-tests/dup.c
+++ b/gettext-tools/gnulib-tests/dup.c
@@ -1,6 +1,6 @@
 /* Duplicate an open file descriptor.
 
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
@@ -45,6 +45,31 @@ dup_nothrow (int fd)
 
   return result;
 }
+#elif defined __KLIBC__
+# include <fcntl.h>
+# include <sys/stat.h>
+
+# include <InnoTekLIBC/backend.h>
+
+static int
+dup_nothrow (int fd)
+{
+  int dupfd;
+  struct stat sbuf;
+
+  dupfd = dup (fd);
+  if (dupfd == -1 && errno == ENOTSUP \
+      && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode))
+    {
+      char path[_MAX_PATH];
+
+      /* Get a path from fd */
+      if (!__libc_Back_ioFHToPath (fd, path, sizeof (path)))
+        dupfd = open (path, O_RDONLY);
+    }
+
+  return dupfd;
+}
 #else
 # define dup_nothrow dup
 #endif
diff --git a/gettext-tools/gnulib-tests/fdopen.c b/gettext-tools/gnulib-tests/fdopen.c
index b72c0e8..61fbfdf 100644
--- a/gettext-tools/gnulib-tests/fdopen.c
+++ b/gettext-tools/gnulib-tests/fdopen.c
@@ -1,5 +1,5 @@
 /* Open a stream with a given file descriptor.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/file-has-acl.c b/gettext-tools/gnulib-tests/file-has-acl.c
index 6027c2e..97d14be 100644
--- a/gettext-tools/gnulib-tests/file-has-acl.c
+++ b/gettext-tools/gnulib-tests/file-has-acl.c
@@ -1,6 +1,6 @@
 /* Test whether a file has a nontrivial ACL.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2016 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
diff --git a/gettext-tools/gnulib-tests/fpucw.h b/gettext-tools/gnulib-tests/fpucw.h
index b8cdf7e..05ee0ca 100644
--- a/gettext-tools/gnulib-tests/fpucw.h
+++ b/gettext-tools/gnulib-tests/fpucw.h
@@ -1,5 +1,5 @@
 /* Manipulating the FPU control word.  -*- coding: utf-8 -*-
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/ftell.c b/gettext-tools/gnulib-tests/ftell.c
index 7f11eb3..75ed1b2 100644
--- a/gettext-tools/gnulib-tests/ftell.c
+++ b/gettext-tools/gnulib-tests/ftell.c
@@ -1,5 +1,5 @@
 /* An ftell() function that works around platform bugs.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/ftello.c b/gettext-tools/gnulib-tests/ftello.c
index d6f221a..4c18ed1 100644
--- a/gettext-tools/gnulib-tests/ftello.c
+++ b/gettext-tools/gnulib-tests/ftello.c
@@ -1,5 +1,5 @@
 /* An ftello() function that works around platform bugs.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/getcwd-lgpl.c b/gettext-tools/gnulib-tests/getcwd-lgpl.c
index 1e17e19..c553f7b 100644
--- a/gettext-tools/gnulib-tests/getcwd-lgpl.c
+++ b/gettext-tools/gnulib-tests/getcwd-lgpl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
    This file is part of gnulib.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/getpagesize.c b/gettext-tools/gnulib-tests/getpagesize.c
index 10e9c18..dc4a200 100644
--- a/gettext-tools/gnulib-tests/getpagesize.c
+++ b/gettext-tools/gnulib-tests/getpagesize.c
@@ -1,6 +1,6 @@
 /* getpagesize emulation for systems where it cannot be done in a C macro.
 
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/glthread/thread.c b/gettext-tools/gnulib-tests/glthread/thread.c
index d3829ce..cbfcc91 100644
--- a/gettext-tools/gnulib-tests/glthread/thread.c
+++ b/gettext-tools/gnulib-tests/glthread/thread.c
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/gnulib-tests/glthread/thread.h b/gettext-tools/gnulib-tests/glthread/thread.h
index 2817437..aa0b1ae 100644
--- a/gettext-tools/gnulib-tests/glthread/thread.h
+++ b/gettext-tools/gnulib-tests/glthread/thread.h
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/gnulib-tests/glthread/yield.h b/gettext-tools/gnulib-tests/glthread/yield.h
index b18db5b..19224c6 100644
--- a/gettext-tools/gnulib-tests/glthread/yield.h
+++ b/gettext-tools/gnulib-tests/glthread/yield.h
@@ -1,5 +1,5 @@
 /* Yielding the processor to other threads and processes.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/gnulib-tests/infinity.h b/gettext-tools/gnulib-tests/infinity.h
index 45c30bd..ce23759 100644
--- a/gettext-tools/gnulib-tests/infinity.h
+++ b/gettext-tools/gnulib-tests/infinity.h
@@ -1,5 +1,5 @@
 /* Macros for infinity.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/init.sh b/gettext-tools/gnulib-tests/init.sh
index d366206..97e4e4b 100644
--- a/gettext-tools/gnulib-tests/init.sh
+++ b/gettext-tools/gnulib-tests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 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
@@ -308,13 +308,19 @@ if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \
       fi
     }
   fi
-elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
+elif
+  for diff_opt_ in -U3 -c '' no; do
+    test "$diff_opt_" = no && break
+    diff_out_=`exec 2>/dev/null; diff $diff_opt_ "$0" "$0" </dev/null` && break
+  done
+  test "$diff_opt_" != no
+then
   if test -z "$diff_out_"; then
-    compare_ () { diff -c "$@"; }
+    compare_ () { diff $diff_opt_ "$@"; }
   else
     compare_ ()
     {
-      if diff -c "$@" > diff.out; then
+      if diff $diff_opt_ "$@" > diff.out; then
         # No differences were found, but AIX and HP-UX 'diff' produce output
         # "No differences encountered" or "There are no differences between the
         # files.". Hide this output.
@@ -327,7 +333,7 @@ elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
       fi
     }
   fi
-elif ( cmp --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then
+elif cmp -s /dev/null /dev/null 2>/dev/null; then
   compare_ () { cmp -s "$@"; }
 else
   compare_ () { cmp "$@"; }
@@ -466,7 +472,6 @@ setup_ ()
   fi
 
   initial_cwd_=$PWD
-  fail=0
 
   pfx_=`testdir_prefix_`
   test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
@@ -550,8 +555,9 @@ mktempd_ ()
   # Disallow any trailing slash on specified destdir:
   # it would subvert the post-mktemp "case"-based destdir test.
   case $destdir_ in
-  /) ;;
+  / | //) destdir_slash_=$destdir;;
   */) fail_ "invalid destination dir: remove trailing slash(es)";;
+  *) destdir_slash_=$destdir_/;;
   esac
 
   case $template_ in
@@ -561,20 +567,17 @@ mktempd_ ()
   esac
 
   # First, try to use mktemp.
-  d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` \
-    || fail=1
+  d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` &&
 
   # The resulting name must be in the specified directory.
-  case $d in "$destdir_"*);; *) fail=1;; esac
+  case $d in "$destdir_slash_"*) :;; *) false;; esac &&
 
   # It must have created the directory.
-  test -d "$d" || fail=1
+  test -d "$d" &&
 
   # It must have 0700 permissions.  Handle sticky "S" bits.
-  perms=`ls -dgo "$d" 2>/dev/null|tr S -` || fail=1
-  case $perms in drwx------*) ;; *) fail=1;; esac
-
-  test $fail = 0 && {
+  perms=`ls -dgo "$d" 2>/dev/null` &&
+  case $perms in drwx--[-S]---*) :;; *) false;; esac && {
     echo "$d"
     return
   }
@@ -593,7 +596,7 @@ mktempd_ ()
   i_=1
   while :; do
     X_=`rand_bytes_ $nx_`
-    candidate_dir_="$destdir_/$base_template_$X_"
+    candidate_dir_="$destdir_slash_$base_template_$X_"
     err_=`mkdir -m 0700 "$candidate_dir_" 2>&1` \
       && { echo "$candidate_dir_"; return; }
     test $MAX_TRIES_ -le $i_ && break;
diff --git a/gettext-tools/gnulib-tests/inttypes.in.h b/gettext-tools/gnulib-tests/inttypes.in.h
index 78846f6..ed09db6 100644
--- a/gettext-tools/gnulib-tests/inttypes.in.h
+++ b/gettext-tools/gnulib-tests/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
diff --git a/gettext-tools/gnulib-tests/lseek.c b/gettext-tools/gnulib-tests/lseek.c
index fdec6cd..2a95a07 100644
--- a/gettext-tools/gnulib-tests/lseek.c
+++ b/gettext-tools/gnulib-tests/lseek.c
@@ -1,5 +1,5 @@
 /* An lseek() function that detects pipes.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/macros.h b/gettext-tools/gnulib-tests/macros.h
index b6fdd1c..578bfe7 100644
--- a/gettext-tools/gnulib-tests/macros.h
+++ b/gettext-tools/gnulib-tests/macros.h
@@ -1,5 +1,5 @@
 /* Common macros used by gnulib tests.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-tools/gnulib-tests/mbtowc-impl.h b/gettext-tools/gnulib-tests/mbtowc-impl.h
index 5c60478..4be2994 100644
--- a/gettext-tools/gnulib-tests/mbtowc-impl.h
+++ b/gettext-tools/gnulib-tests/mbtowc-impl.h
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/mbtowc.c b/gettext-tools/gnulib-tests/mbtowc.c
index e58053d..fb2b651 100644
--- a/gettext-tools/gnulib-tests/mbtowc.c
+++ b/gettext-tools/gnulib-tests/mbtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/minus-zero.h b/gettext-tools/gnulib-tests/minus-zero.h
index 79291ee..d10d060 100644
--- a/gettext-tools/gnulib-tests/minus-zero.h
+++ b/gettext-tools/gnulib-tests/minus-zero.h
@@ -1,5 +1,5 @@
 /* Macros for floating-point negative zero.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/nan.h b/gettext-tools/gnulib-tests/nan.h
index 9f6819c..2578eb5 100644
--- a/gettext-tools/gnulib-tests/nan.h
+++ b/gettext-tools/gnulib-tests/nan.h
@@ -1,5 +1,5 @@
 /* Macros for not-a-number.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/putenv.c b/gettext-tools/gnulib-tests/putenv.c
index 925bb2f..e67712d 100644
--- a/gettext-tools/gnulib-tests/putenv.c
+++ b/gettext-tools/gnulib-tests/putenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2015 Free Software
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
diff --git a/gettext-tools/gnulib-tests/randomd.c b/gettext-tools/gnulib-tests/randomd.c
index 9642428..afdc7fb 100644
--- a/gettext-tools/gnulib-tests/randomd.c
+++ b/gettext-tools/gnulib-tests/randomd.c
@@ -1,5 +1,5 @@
 /* Some random 'double' numbers used by gnulib tests.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 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
diff --git a/gettext-tools/gnulib-tests/read-file.c b/gettext-tools/gnulib-tests/read-file.c
index f17c599..f7b1199 100644
--- a/gettext-tools/gnulib-tests/read-file.c
+++ b/gettext-tools/gnulib-tests/read-file.c
@@ -1,5 +1,5 @@
 /* read-file.c -- read file contents into a string
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Simon Josefsson and Bruno Haible.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/read-file.h b/gettext-tools/gnulib-tests/read-file.h
index b869c5c..6248065 100644
--- a/gettext-tools/gnulib-tests/read-file.h
+++ b/gettext-tools/gnulib-tests/read-file.h
@@ -1,5 +1,5 @@
 /* read-file.h -- read file contents into a string
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/same-inode.h b/gettext-tools/gnulib-tests/same-inode.h
index ecc3049..bf45635 100644
--- a/gettext-tools/gnulib-tests/same-inode.h
+++ b/gettext-tools/gnulib-tests/same-inode.h
@@ -1,6 +1,6 @@
 /* Determine whether two stat buffers refer to the same file.
 
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/signature.h b/gettext-tools/gnulib-tests/signature.h
index 0a6cf91..2df8067 100644
--- a/gettext-tools/gnulib-tests/signature.h
+++ b/gettext-tools/gnulib-tests/signature.h
@@ -1,5 +1,5 @@
 /* Macro for checking that a function declaration is compliant.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/sleep.c b/gettext-tools/gnulib-tests/sleep.c
index b86ec6f..997285e 100644
--- a/gettext-tools/gnulib-tests/sleep.c
+++ b/gettext-tools/gnulib-tests/sleep.c
@@ -1,5 +1,5 @@
 /* Pausing execution of the current thread.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/stdalign.in.h b/gettext-tools/gnulib-tests/stdalign.in.h
index b16ccc8..12f8a15 100644
--- a/gettext-tools/gnulib-tests/stdalign.in.h
+++ b/gettext-tools/gnulib-tests/stdalign.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C11 <stdalign.h>.
 
-   Copyright 2011-2015 Free Software Foundation, Inc.
+   Copyright 2011-2016 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
@@ -103,15 +103,15 @@
 # elif ((defined __APPLE__ && defined __MACH__                  \
          ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__)                 \
          : __GNUC__)                                            \
-        || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__        \
-        || __ICC || 0x590 <= __SUNPRO_C)
+        || 061200 <= __HP_cc || 061200 <= __HP_aCC                \
+        || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__)
 #  define _Alignas(a) __attribute__ ((__aligned__ (a)))
 # elif 1300 <= _MSC_VER
 #  define _Alignas(a) __declspec (align (a))
 # endif
 #endif
 #if ((defined _Alignas && ! (defined __cplusplus && 201103 <= __cplusplus)) \
-     || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__))
+     || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
 # define alignas _Alignas
 #endif
 #if defined alignas || (defined __cplusplus && 201103 <= __cplusplus)
diff --git a/gettext-tools/gnulib-tests/stdio-impl.h b/gettext-tools/gnulib-tests/stdio-impl.h
index 502d891..987897a 100644
--- a/gettext-tools/gnulib-tests/stdio-impl.h
+++ b/gettext-tools/gnulib-tests/stdio-impl.h
@@ -1,5 +1,5 @@
 /* Implementation details of FILE streams.
-   Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008, 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/symlink.c b/gettext-tools/gnulib-tests/symlink.c
index 14356c3..d8684b6 100644
--- a/gettext-tools/gnulib-tests/symlink.c
+++ b/gettext-tools/gnulib-tests/symlink.c
@@ -1,5 +1,5 @@
 /* Stub for symlink().
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-alignof.c b/gettext-tools/gnulib-tests/test-alignof.c
index a04d69b..2af76f5 100644
--- a/gettext-tools/gnulib-tests/test-alignof.c
+++ b/gettext-tools/gnulib-tests/test-alignof.c
@@ -1,5 +1,5 @@
 /* Test of <alignof.h>.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-alloca-opt.c b/gettext-tools/gnulib-tests/test-alloca-opt.c
index c189cc6..b9aaa4a 100644
--- a/gettext-tools/gnulib-tests/test-alloca-opt.c
+++ b/gettext-tools/gnulib-tests/test-alloca-opt.c
@@ -1,5 +1,5 @@
 /* Test of optional automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-areadlink.c b/gettext-tools/gnulib-tests/test-areadlink.c
index 682c03b..738a498 100644
--- a/gettext-tools/gnulib-tests/test-areadlink.c
+++ b/gettext-tools/gnulib-tests/test-areadlink.c
@@ -1,5 +1,5 @@
 /* Tests of areadlink.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-areadlink.h b/gettext-tools/gnulib-tests/test-areadlink.h
index a93c9eb..3251ca2 100644
--- a/gettext-tools/gnulib-tests/test-areadlink.h
+++ b/gettext-tools/gnulib-tests/test-areadlink.h
@@ -1,5 +1,5 @@
 /* Tests of areadlink and friends.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-argmatch.c b/gettext-tools/gnulib-tests/test-argmatch.c
index e6802b7..9a3a4a9 100644
--- a/gettext-tools/gnulib-tests/test-argmatch.c
+++ b/gettext-tools/gnulib-tests/test-argmatch.c
@@ -1,5 +1,5 @@
 /* Test of exact or abbreviated match search.
-   Copyright (C) 1990, 1998-1999, 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1998-1999, 2001-2016 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
diff --git a/gettext-tools/gnulib-tests/test-array_list.c b/gettext-tools/gnulib-tests/test-array_list.c
index a2aca72..88e2bb2 100644
--- a/gettext-tools/gnulib-tests/test-array_list.c
+++ b/gettext-tools/gnulib-tests/test-array_list.c
@@ -1,5 +1,5 @@
 /* Test of sequential list data type implementation.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-atexit.c b/gettext-tools/gnulib-tests/test-atexit.c
index aec7cd5..3a3e208 100644
--- a/gettext-tools/gnulib-tests/test-atexit.c
+++ b/gettext-tools/gnulib-tests/test-atexit.c
@@ -1,5 +1,5 @@
 /* Test of execution of program termination handlers.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-binary-io.c b/gettext-tools/gnulib-tests/test-binary-io.c
index 9c3f8f2..6801e96 100644
--- a/gettext-tools/gnulib-tests/test-binary-io.c
+++ b/gettext-tools/gnulib-tests/test-binary-io.c
@@ -1,5 +1,5 @@
 /* Test of binary mode I/O.
-   Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-btowc.c b/gettext-tools/gnulib-tests/test-btowc.c
index be34739..9953ac4 100644
--- a/gettext-tools/gnulib-tests/test-btowc.c
+++ b/gettext-tools/gnulib-tests/test-btowc.c
@@ -1,5 +1,5 @@
 /* Test of conversion of unibyte character to wide character.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-byteswap.c b/gettext-tools/gnulib-tests/test-byteswap.c
index 66ef8d8..909bd54 100644
--- a/gettext-tools/gnulib-tests/test-byteswap.c
+++ b/gettext-tools/gnulib-tests/test-byteswap.c
@@ -1,5 +1,5 @@
 /* Test of <byteswap.h> substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-c-ctype.c b/gettext-tools/gnulib-tests/test-c-ctype.c
index 9780554..184cdec 100644
--- a/gettext-tools/gnulib-tests/test-c-ctype.c
+++ b/gettext-tools/gnulib-tests/test-c-ctype.c
@@ -1,5 +1,5 @@
 /* Test of character handling in C locale.
-   Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-c-strcasecmp.c b/gettext-tools/gnulib-tests/test-c-strcasecmp.c
index f7f6b43..37f9431 100644
--- a/gettext-tools/gnulib-tests/test-c-strcasecmp.c
+++ b/gettext-tools/gnulib-tests/test-c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-c-strcasestr.c b/gettext-tools/gnulib-tests/test-c-strcasestr.c
index 84d6107..e9d4a81 100644
--- a/gettext-tools/gnulib-tests/test-c-strcasestr.c
+++ b/gettext-tools/gnulib-tests/test-c-strcasestr.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive searching in a string.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-c-strncasecmp.c b/gettext-tools/gnulib-tests/test-c-strncasecmp.c
index 4027b5b..1ca42d8 100644
--- a/gettext-tools/gnulib-tests/test-c-strncasecmp.c
+++ b/gettext-tools/gnulib-tests/test-c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-c-strstr.c b/gettext-tools/gnulib-tests/test-c-strstr.c
index 2bc2d9e..abfd400 100644
--- a/gettext-tools/gnulib-tests/test-c-strstr.c
+++ b/gettext-tools/gnulib-tests/test-c-strstr.c
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c b/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c
index 12d2bb0..e5f0adb 100644
--- a/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c
+++ b/gettext-tools/gnulib-tests/test-canonicalize-lgpl.c
@@ -1,5 +1,5 @@
 /* Test of execution of program termination handlers.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-cloexec.c b/gettext-tools/gnulib-tests/test-cloexec.c
index c4feeba..1c0be99 100644
--- a/gettext-tools/gnulib-tests/test-cloexec.c
+++ b/gettext-tools/gnulib-tests/test-cloexec.c
@@ -1,5 +1,5 @@
 /* Test duplicating non-inheritable file descriptors.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-close.c b/gettext-tools/gnulib-tests/test-close.c
index 457a7bc..a0428e0 100644
--- a/gettext-tools/gnulib-tests/test-close.c
+++ b/gettext-tools/gnulib-tests/test-close.c
@@ -1,5 +1,5 @@
 /* Test closing a file or socket.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-copy-acl.c b/gettext-tools/gnulib-tests/test-copy-acl.c
index 1c5227f..93bcf42 100644
--- a/gettext-tools/gnulib-tests/test-copy-acl.c
+++ b/gettext-tools/gnulib-tests/test-copy-acl.c
@@ -1,5 +1,5 @@
 /* Test of copying of files.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-copy-file.c b/gettext-tools/gnulib-tests/test-copy-file.c
index a99e463..57bd930 100644
--- a/gettext-tools/gnulib-tests/test-copy-file.c
+++ b/gettext-tools/gnulib-tests/test-copy-file.c
@@ -1,5 +1,5 @@
 /* Test of copying of files.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-ctype.c b/gettext-tools/gnulib-tests/test-ctype.c
index 58750e1..570fbdb 100644
--- a/gettext-tools/gnulib-tests/test-ctype.c
+++ b/gettext-tools/gnulib-tests/test-ctype.c
@@ -1,5 +1,5 @@
 /* Test of <ctype.h> substitute.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-dirent.c b/gettext-tools/gnulib-tests/test-dirent.c
index 243b92b..50a0c95 100644
--- a/gettext-tools/gnulib-tests/test-dirent.c
+++ b/gettext-tools/gnulib-tests/test-dirent.c
@@ -1,5 +1,5 @@
 /* Test of <dirent.h> substitute.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-dup-safer.c b/gettext-tools/gnulib-tests/test-dup-safer.c
index 7f6427c..fdae635 100644
--- a/gettext-tools/gnulib-tests/test-dup-safer.c
+++ b/gettext-tools/gnulib-tests/test-dup-safer.c
@@ -1,5 +1,5 @@
 /* Test that dup_safer leaves standard fds alone.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-dup.c b/gettext-tools/gnulib-tests/test-dup.c
index b7b768e..c62b06f 100644
--- a/gettext-tools/gnulib-tests/test-dup.c
+++ b/gettext-tools/gnulib-tests/test-dup.c
@@ -1,5 +1,5 @@
 /* Test duplicating a file descriptor.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-dup2.c b/gettext-tools/gnulib-tests/test-dup2.c
index be475ea..5da6812 100644
--- a/gettext-tools/gnulib-tests/test-dup2.c
+++ b/gettext-tools/gnulib-tests/test-dup2.c
@@ -1,5 +1,5 @@
 /* Test duplicating file descriptors.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-environ.c b/gettext-tools/gnulib-tests/test-environ.c
index 8395e9d..3681325 100644
--- a/gettext-tools/gnulib-tests/test-environ.c
+++ b/gettext-tools/gnulib-tests/test-environ.c
@@ -1,5 +1,5 @@
 /* Test of environ variable.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-errno.c b/gettext-tools/gnulib-tests/test-errno.c
index fab35d0..1e0bb6d 100644
--- a/gettext-tools/gnulib-tests/test-errno.c
+++ b/gettext-tools/gnulib-tests/test-errno.c
@@ -1,5 +1,5 @@
 /* Test of <errno.h> substitute.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fabs.c b/gettext-tools/gnulib-tests/test-fabs.c
index 0e90681..5691884 100644
--- a/gettext-tools/gnulib-tests/test-fabs.c
+++ b/gettext-tools/gnulib-tests/test-fabs.c
@@ -1,5 +1,5 @@
 /* Test of fabs() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fabs.h b/gettext-tools/gnulib-tests/test-fabs.h
index 1edf8ef..14f4914 100644
--- a/gettext-tools/gnulib-tests/test-fabs.h
+++ b/gettext-tools/gnulib-tests/test-fabs.h
@@ -1,5 +1,5 @@
 /* Test of fabs*() function family.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fcntl-h.c b/gettext-tools/gnulib-tests/test-fcntl-h.c
index e177b3e..aef1661 100644
--- a/gettext-tools/gnulib-tests/test-fcntl-h.c
+++ b/gettext-tools/gnulib-tests/test-fcntl-h.c
@@ -1,5 +1,5 @@
 /* Test of <fcntl.h> substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fcntl.c b/gettext-tools/gnulib-tests/test-fcntl.c
index fed914b..974ee33 100644
--- a/gettext-tools/gnulib-tests/test-fcntl.c
+++ b/gettext-tools/gnulib-tests/test-fcntl.c
@@ -1,5 +1,5 @@
 /* Test of fcntl(2).
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fdopen.c b/gettext-tools/gnulib-tests/test-fdopen.c
index c4e0355..55b49a6 100644
--- a/gettext-tools/gnulib-tests/test-fdopen.c
+++ b/gettext-tools/gnulib-tests/test-fdopen.c
@@ -1,5 +1,5 @@
 /* Test opening a stream with a file descriptor.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fgetc.c b/gettext-tools/gnulib-tests/test-fgetc.c
index 63e1e4a..c62e70c 100644
--- a/gettext-tools/gnulib-tests/test-fgetc.c
+++ b/gettext-tools/gnulib-tests/test-fgetc.c
@@ -1,5 +1,5 @@
 /* Test of fgetc() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-file-has-acl.c b/gettext-tools/gnulib-tests/test-file-has-acl.c
index 0f33e0c..8a446a6 100644
--- a/gettext-tools/gnulib-tests/test-file-has-acl.c
+++ b/gettext-tools/gnulib-tests/test-file-has-acl.c
@@ -1,5 +1,5 @@
 /* Test for presence of ACL.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-float.c b/gettext-tools/gnulib-tests/test-float.c
index 8b62133..a5f33b6 100644
--- a/gettext-tools/gnulib-tests/test-float.c
+++ b/gettext-tools/gnulib-tests/test-float.c
@@ -1,5 +1,5 @@
 /* Test of <float.h> substitute.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fnmatch.c b/gettext-tools/gnulib-tests/test-fnmatch.c
index 970b284..c110409 100644
--- a/gettext-tools/gnulib-tests/test-fnmatch.c
+++ b/gettext-tools/gnulib-tests/test-fnmatch.c
@@ -1,5 +1,5 @@
 /* Test of fnmatch string matching function.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fopen.c b/gettext-tools/gnulib-tests/test-fopen.c
index 7b5d70c..22ef2ff 100644
--- a/gettext-tools/gnulib-tests/test-fopen.c
+++ b/gettext-tools/gnulib-tests/test-fopen.c
@@ -1,5 +1,5 @@
 /* Test of opening a file stream.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fopen.h b/gettext-tools/gnulib-tests/test-fopen.h
index 4747dc6..3d72466 100644
--- a/gettext-tools/gnulib-tests/test-fopen.h
+++ b/gettext-tools/gnulib-tests/test-fopen.h
@@ -1,5 +1,5 @@
 /* Test of opening a file stream.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fputc.c b/gettext-tools/gnulib-tests/test-fputc.c
index 41ae096..95a1cb6 100644
--- a/gettext-tools/gnulib-tests/test-fputc.c
+++ b/gettext-tools/gnulib-tests/test-fputc.c
@@ -1,5 +1,5 @@
 /* Test of fputc() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fread.c b/gettext-tools/gnulib-tests/test-fread.c
index 41cea56..b9fc72a 100644
--- a/gettext-tools/gnulib-tests/test-fread.c
+++ b/gettext-tools/gnulib-tests/test-fread.c
@@ -1,5 +1,5 @@
 /* Test of fread() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fstat.c b/gettext-tools/gnulib-tests/test-fstat.c
index 7f39363..c9ac749 100644
--- a/gettext-tools/gnulib-tests/test-fstat.c
+++ b/gettext-tools/gnulib-tests/test-fstat.c
@@ -1,5 +1,5 @@
 /* Tests of fstat() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fstrcmp.c b/gettext-tools/gnulib-tests/test-fstrcmp.c
index 7e00535..c109444 100644
--- a/gettext-tools/gnulib-tests/test-fstrcmp.c
+++ b/gettext-tools/gnulib-tests/test-fstrcmp.c
@@ -1,5 +1,5 @@
 /* Test of fuzzy string comparison.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-ftell.c b/gettext-tools/gnulib-tests/test-ftell.c
index 2853226..9b52344 100644
--- a/gettext-tools/gnulib-tests/test-ftell.c
+++ b/gettext-tools/gnulib-tests/test-ftell.c
@@ -1,5 +1,5 @@
 /* Test of ftell() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-ftell3.c b/gettext-tools/gnulib-tests/test-ftell3.c
index 8a95e1c..695e5b2 100644
--- a/gettext-tools/gnulib-tests/test-ftell3.c
+++ b/gettext-tools/gnulib-tests/test-ftell3.c
@@ -1,5 +1,5 @@
 /* Test of ftell() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-ftello.c b/gettext-tools/gnulib-tests/test-ftello.c
index b9b5c96..369d476 100644
--- a/gettext-tools/gnulib-tests/test-ftello.c
+++ b/gettext-tools/gnulib-tests/test-ftello.c
@@ -1,5 +1,5 @@
 /* Test of ftello() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-ftello3.c b/gettext-tools/gnulib-tests/test-ftello3.c
index 67b4671..f75ce03 100644
--- a/gettext-tools/gnulib-tests/test-ftello3.c
+++ b/gettext-tools/gnulib-tests/test-ftello3.c
@@ -1,5 +1,5 @@
 /* Test of ftello() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-ftello4.c b/gettext-tools/gnulib-tests/test-ftello4.c
index 68e6459..1f94ef6 100644
--- a/gettext-tools/gnulib-tests/test-ftello4.c
+++ b/gettext-tools/gnulib-tests/test-ftello4.c
@@ -1,5 +1,5 @@
 /* Test of ftello() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-fwrite.c b/gettext-tools/gnulib-tests/test-fwrite.c
index df4114c..bc285f3 100644
--- a/gettext-tools/gnulib-tests/test-fwrite.c
+++ b/gettext-tools/gnulib-tests/test-fwrite.c
@@ -1,5 +1,5 @@
 /* Test of fwrite() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-getcwd-lgpl.c b/gettext-tools/gnulib-tests/test-getcwd-lgpl.c
index de1728b..6bea7b7 100644
--- a/gettext-tools/gnulib-tests/test-getcwd-lgpl.c
+++ b/gettext-tools/gnulib-tests/test-getcwd-lgpl.c
@@ -1,5 +1,5 @@
 /* Test of getcwd() function.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-getdelim.c b/gettext-tools/gnulib-tests/test-getdelim.c
index bbcc3cd..0770d5b 100644
--- a/gettext-tools/gnulib-tests/test-getdelim.c
+++ b/gettext-tools/gnulib-tests/test-getdelim.c
@@ -1,5 +1,5 @@
 /* Test of getdelim() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-getdtablesize.c b/gettext-tools/gnulib-tests/test-getdtablesize.c
index a0325af..54efa04 100644
--- a/gettext-tools/gnulib-tests/test-getdtablesize.c
+++ b/gettext-tools/gnulib-tests/test-getdtablesize.c
@@ -1,5 +1,5 @@
 /* Test of getdtablesize() function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-getline.c b/gettext-tools/gnulib-tests/test-getline.c
index 238742c..13dcb1d 100644
--- a/gettext-tools/gnulib-tests/test-getline.c
+++ b/gettext-tools/gnulib-tests/test-getline.c
@@ -1,5 +1,5 @@
 /* Test of getline() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
@@ -71,8 +71,8 @@ main (void)
   free (line);
 
   /* Test growth of buffer, must not leak.  */
-  line = malloc (1);
-  len = 0;
+  len = 1;
+  line = malloc (len);
   result = getline (&line, &len, f);
   ASSERT (result == 3);
   ASSERT (strcmp (line, "bc\n") == 0);
diff --git a/gettext-tools/gnulib-tests/test-getopt.c b/gettext-tools/gnulib-tests/test-getopt.c
index a0ae340..505cb2a 100644
--- a/gettext-tools/gnulib-tests/test-getopt.c
+++ b/gettext-tools/gnulib-tests/test-getopt.c
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-getopt.h b/gettext-tools/gnulib-tests/test-getopt.h
index caaaa31..8e61eb2 100644
--- a/gettext-tools/gnulib-tests/test-getopt.h
+++ b/gettext-tools/gnulib-tests/test-getopt.h
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-getopt_long.h b/gettext-tools/gnulib-tests/test-getopt_long.h
index 1094f3c..0f83f47 100644
--- a/gettext-tools/gnulib-tests/test-getopt_long.h
+++ b/gettext-tools/gnulib-tests/test-getopt_long.h
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-gettimeofday.c b/gettext-tools/gnulib-tests/test-gettimeofday.c
index 3b15f12..7a44d71 100644
--- a/gettext-tools/gnulib-tests/test-gettimeofday.c
+++ b/gettext-tools/gnulib-tests/test-gettimeofday.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc.
  * Written by Jim Meyering.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-iconv-h.c b/gettext-tools/gnulib-tests/test-iconv-h.c
index 5b688d9..fbb0548 100644
--- a/gettext-tools/gnulib-tests/test-iconv-h.c
+++ b/gettext-tools/gnulib-tests/test-iconv-h.c
@@ -1,5 +1,5 @@
 /* Test of <iconv.h> substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-iconv.c b/gettext-tools/gnulib-tests/test-iconv.c
index ed715bd..3e4c4ff 100644
--- a/gettext-tools/gnulib-tests/test-iconv.c
+++ b/gettext-tools/gnulib-tests/test-iconv.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-ignore-value.c b/gettext-tools/gnulib-tests/test-ignore-value.c
index fc98860..7c4b2de 100644
--- a/gettext-tools/gnulib-tests/test-ignore-value.c
+++ b/gettext-tools/gnulib-tests/test-ignore-value.c
@@ -1,6 +1,6 @@
 /* Test the "ignore-value" module.
 
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-init.sh b/gettext-tools/gnulib-tests/test-init.sh
index 0875a75..1dd05f4 100755
--- a/gettext-tools/gnulib-tests/test-init.sh
+++ b/gettext-tools/gnulib-tests/test-init.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for init.sh
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2016 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-intprops.c b/gettext-tools/gnulib-tests/test-intprops.c
index 82dc9bf..51fe096 100644
--- a/gettext-tools/gnulib-tests/test-intprops.c
+++ b/gettext-tools/gnulib-tests/test-intprops.c
@@ -1,5 +1,5 @@
 /* Test intprops.h.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
@@ -94,12 +94,8 @@ main (void)
   ASSERT (TYPE_SIGNED (double));
   ASSERT (TYPE_SIGNED (long double));
 
-  /* Integer representation.  */
-  VERIFY (INT_MIN + INT_MAX < 0
-          ? (TYPE_TWOS_COMPLEMENT (int)
-             && ! TYPE_ONES_COMPLEMENT (int) && ! TYPE_SIGNED_MAGNITUDE (int))
-          : (! TYPE_TWOS_COMPLEMENT (int)
-             && (TYPE_ONES_COMPLEMENT (int) || TYPE_SIGNED_MAGNITUDE (int))));
+  /* Integer representation.  Check that it is two's complement.  */
+  VERIFY (INT_MIN + INT_MAX < 0);
 
   /* TYPE_MINIMUM, TYPE_MAXIMUM.  */
   VERIFY (TYPE_MINIMUM (char) == CHAR_MIN);
@@ -156,8 +152,7 @@ main (void)
     {                                                                     \
       t result;                                                           \
       ASSERT (INT_##opname##_WRAPV (a, b, &result) == (v));               \
-      ASSERT (result == ((v) ? (vres) : ((a) op (b)))                     \
-              || ((v) && !TYPE_TWOS_COMPLEMENT (t)));                     \
+      ASSERT (result == ((v) ? (vres) : ((a) op (b))));                   \
     }
   #define CHECK_UNOP(op, opname, a, t, v)                                 \
     VERIFY (INT_##opname##_RANGE_OVERFLOW (a, TYPE_MINIMUM (t),           \
@@ -183,7 +178,7 @@ main (void)
   CHECK_BINOP (-, SUBTRACT, UINT_MAX, 1u, unsigned int, false, UINT_MAX - 1u);
   CHECK_BINOP (-, SUBTRACT, 0u, 1u, unsigned int, true, 0u - 1u);
 
-  CHECK_UNOP (-, NEGATE, INT_MIN, int, TYPE_TWOS_COMPLEMENT (int));
+  CHECK_UNOP (-, NEGATE, INT_MIN, int, true);
   CHECK_UNOP (-, NEGATE, 0, int, false);
   CHECK_UNOP (-, NEGATE, INT_MAX, int, false);
   CHECK_UNOP (-, NEGATE, 0u, unsigned int, false);
@@ -230,8 +225,7 @@ main (void)
     {                                                                     \
       t result;                                                           \
       ASSERT (INT_ADD_WRAPV (a, b, &result) == (v));                      \
-      ASSERT (result == ((v) ? (vres) : ((a) + (b)))                      \
-              || ((v) && !TYPE_TWOS_COMPLEMENT (t)));                     \
+      ASSERT (result == ((v) ? (vres) : ((a) + (b))));                    \
     }
   CHECK_SSUM (-1, LONG_MIN, long int, true, LONG_MAX);
   CHECK_SUM (-1, UINT_MAX, unsigned int, false, DONTCARE);
@@ -259,8 +253,7 @@ main (void)
     {                                                                     \
       t result;                                                           \
       ASSERT (INT_SUBTRACT_WRAPV (a, b, &result) == (v));                 \
-      ASSERT (result == ((v) ? (vres) : ((a) - (b)))                      \
-              || ((v) && !TYPE_TWOS_COMPLEMENT (t)));                     \
+      ASSERT (result == ((v) ? (vres) : ((a) - (b))));                    \
     }
   CHECK_DIFFERENCE (INT_MAX, 1u, unsigned int, UINT_MAX < INT_MAX - 1,
                     INT_MAX - 1u);
@@ -292,8 +285,7 @@ main (void)
     {                                                                     \
       t result;                                                           \
       ASSERT (INT_MULTIPLY_WRAPV (a, b, &result) == (v));                 \
-      ASSERT (result == ((v) ? (vres) : ((a) * (b)))                      \
-              || ((v) && !TYPE_TWOS_COMPLEMENT (t)));                     \
+      ASSERT (result == ((v) ? (vres) : ((a) * (b))));                    \
     }
   CHECK_PRODUCT (-1, 1u, unsigned int, true, -1 * 1u);
   CHECK_SPRODUCT (-1, INT_MIN, int, INT_NEGATE_OVERFLOW (INT_MIN), INT_MIN);
@@ -351,8 +343,7 @@ main (void)
 
   #define CHECK_QUOTIENT(a, b, v) VERIFY (INT_DIVIDE_OVERFLOW (a, b) == (v))
 
-  CHECK_QUOTIENT (INT_MIN, -1L,
-                  TYPE_TWOS_COMPLEMENT (long int) && INT_MIN == LONG_MIN);
+  CHECK_QUOTIENT (INT_MIN, -1L, INT_MIN == LONG_MIN);
   CHECK_QUOTIENT (INT_MIN, UINT_MAX, false);
   CHECK_QUOTIENT (INTMAX_MIN, UINTMAX_MAX, false);
   CHECK_QUOTIENT (INTMAX_MIN, UINT_MAX, false);
@@ -365,8 +356,7 @@ main (void)
 
   #define CHECK_REMAINDER(a, b, v) VERIFY (INT_REMAINDER_OVERFLOW (a, b) == (v))
 
-  CHECK_REMAINDER (INT_MIN, -1L,
-                   TYPE_TWOS_COMPLEMENT (long int) && INT_MIN == LONG_MIN);
+  CHECK_REMAINDER (INT_MIN, -1L, INT_MIN == LONG_MIN);
   CHECK_REMAINDER (-1, UINT_MAX, true);
   CHECK_REMAINDER ((intmax_t) -1, UINTMAX_MAX, true);
   CHECK_REMAINDER (INTMAX_MIN, UINT_MAX,
diff --git a/gettext-tools/gnulib-tests/test-inttypes.c b/gettext-tools/gnulib-tests/test-inttypes.c
index 7fa18b2..9a3193c 100644
--- a/gettext-tools/gnulib-tests/test-inttypes.c
+++ b/gettext-tools/gnulib-tests/test-inttypes.c
@@ -1,5 +1,5 @@
 /* Test of <inttypes.h> substitute.
-   Copyright (C) 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isinf.c b/gettext-tools/gnulib-tests/test-isinf.c
index d56feb4..1a29559 100644
--- a/gettext-tools/gnulib-tests/test-isinf.c
+++ b/gettext-tools/gnulib-tests/test-isinf.c
@@ -1,5 +1,5 @@
 /* Test of isinf() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnan.c b/gettext-tools/gnulib-tests/test-isnan.c
index bb4c940..10e8365 100644
--- a/gettext-tools/gnulib-tests/test-isnan.c
+++ b/gettext-tools/gnulib-tests/test-isnan.c
@@ -1,5 +1,5 @@
 /* Test of isnand() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnand-nolibm.c b/gettext-tools/gnulib-tests/test-isnand-nolibm.c
index 984d184..fd3bbaf 100644
--- a/gettext-tools/gnulib-tests/test-isnand-nolibm.c
+++ b/gettext-tools/gnulib-tests/test-isnand-nolibm.c
@@ -1,5 +1,5 @@
 /* Test of isnand() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnand.c b/gettext-tools/gnulib-tests/test-isnand.c
index 175bdbe..59ec52b 100644
--- a/gettext-tools/gnulib-tests/test-isnand.c
+++ b/gettext-tools/gnulib-tests/test-isnand.c
@@ -1,5 +1,5 @@
 /* Test of isnand() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnand.h b/gettext-tools/gnulib-tests/test-isnand.h
index 06fc183..8bc4139 100644
--- a/gettext-tools/gnulib-tests/test-isnand.h
+++ b/gettext-tools/gnulib-tests/test-isnand.h
@@ -1,5 +1,5 @@
 /* Test of isnand() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnanf-nolibm.c b/gettext-tools/gnulib-tests/test-isnanf-nolibm.c
index 7f70eb5..42f5b10 100644
--- a/gettext-tools/gnulib-tests/test-isnanf-nolibm.c
+++ b/gettext-tools/gnulib-tests/test-isnanf-nolibm.c
@@ -1,5 +1,5 @@
 /* Test of isnanf() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnanf.c b/gettext-tools/gnulib-tests/test-isnanf.c
index 9d67270..1e67658 100644
--- a/gettext-tools/gnulib-tests/test-isnanf.c
+++ b/gettext-tools/gnulib-tests/test-isnanf.c
@@ -1,5 +1,5 @@
 /* Test of isnanf() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnanf.h b/gettext-tools/gnulib-tests/test-isnanf.h
index cf51f12..abb992d 100644
--- a/gettext-tools/gnulib-tests/test-isnanf.h
+++ b/gettext-tools/gnulib-tests/test-isnanf.h
@@ -1,5 +1,5 @@
 /* Test of isnanf() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnanl-nolibm.c b/gettext-tools/gnulib-tests/test-isnanl-nolibm.c
index 63ea5a9..e7bad11 100644
--- a/gettext-tools/gnulib-tests/test-isnanl-nolibm.c
+++ b/gettext-tools/gnulib-tests/test-isnanl-nolibm.c
@@ -1,5 +1,5 @@
 /* Test of isnanl() substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnanl.c b/gettext-tools/gnulib-tests/test-isnanl.c
index f3fcbd3..e4b815a 100644
--- a/gettext-tools/gnulib-tests/test-isnanl.c
+++ b/gettext-tools/gnulib-tests/test-isnanl.c
@@ -1,5 +1,5 @@
 /* Test of isnanl() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-isnanl.h b/gettext-tools/gnulib-tests/test-isnanl.h
index 2e65afa..25985e7 100644
--- a/gettext-tools/gnulib-tests/test-isnanl.h
+++ b/gettext-tools/gnulib-tests/test-isnanl.h
@@ -1,5 +1,5 @@
 /* Test of isnanl() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-iswblank.c b/gettext-tools/gnulib-tests/test-iswblank.c
index f1fbe41..175718f 100644
--- a/gettext-tools/gnulib-tests/test-iswblank.c
+++ b/gettext-tools/gnulib-tests/test-iswblank.c
@@ -1,5 +1,5 @@
 /* Test of iswblank() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-langinfo.c b/gettext-tools/gnulib-tests/test-langinfo.c
index b038ca3..30b0007 100644
--- a/gettext-tools/gnulib-tests/test-langinfo.c
+++ b/gettext-tools/gnulib-tests/test-langinfo.c
@@ -1,5 +1,5 @@
 /* Test of <langinfo.h> substitute.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-linkedhash_list.c b/gettext-tools/gnulib-tests/test-linkedhash_list.c
index be5b166..946df5d 100644
--- a/gettext-tools/gnulib-tests/test-linkedhash_list.c
+++ b/gettext-tools/gnulib-tests/test-linkedhash_list.c
@@ -1,5 +1,5 @@
 /* Test of sequential list data type implementation.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-locale.c b/gettext-tools/gnulib-tests/test-locale.c
index 5383cff..c1811af 100644
--- a/gettext-tools/gnulib-tests/test-locale.c
+++ b/gettext-tools/gnulib-tests/test-locale.c
@@ -1,5 +1,5 @@
 /* Test of <locale.h> substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-localename.c b/gettext-tools/gnulib-tests/test-localename.c
index b5dd742..be8fcaf 100644
--- a/gettext-tools/gnulib-tests/test-localename.c
+++ b/gettext-tools/gnulib-tests/test-localename.c
@@ -1,5 +1,5 @@
 /* Test of gl_locale_name function and its variants.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
@@ -183,6 +183,8 @@ test_locale_name (void)
         ASSERT (strcmp (name, "fr_FR.UTF-8") == 0);
         name = gl_locale_name (LC_MESSAGES, "LC_MESSAGES");
         ASSERT (strcmp (name, "fr_FR.UTF-8") == 0);
+        uselocale (LC_GLOBAL_LOCALE);
+        freelocale (locale);
       }
   }
 
@@ -194,11 +196,13 @@ test_locale_name (void)
     for (i = 0; i < SIZEOF (categories); i++)
       {
         int category_mask = categories[i].mask;
-        locale_t locale = newlocale (LC_ALL_MASK, "fr_FR.UTF-8", NULL);
-        if (locale != NULL)
+        locale_t loc = newlocale (LC_ALL_MASK, "fr_FR.UTF-8", NULL);
+        if (loc != NULL)
           {
-            locale = newlocale (category_mask, "de_DE.UTF-8", locale);
-            if (locale != NULL)
+            locale_t locale = newlocale (category_mask, "de_DE.UTF-8", loc);
+            if (locale == NULL)
+              freelocale (loc);
+            else
               {
                 unsigned int j;
 
@@ -212,6 +216,8 @@ test_locale_name (void)
                     else
                       ASSERT (strcmp (name_j, "fr_FR.UTF-8") == 0);
                   }
+                uselocale (LC_GLOBAL_LOCALE);
+                freelocale (locale);
               }
           }
       }
@@ -245,6 +251,8 @@ test_locale_name_thread (void)
         ASSERT (strcmp (name, "fr_FR.UTF-8") == 0);
         name = gl_locale_name_thread (LC_MESSAGES, "LC_MESSAGES");
         ASSERT (strcmp (name, "fr_FR.UTF-8") == 0);
+        uselocale (LC_GLOBAL_LOCALE);
+        freelocale (locale);
       }
   }
 
@@ -256,11 +264,13 @@ test_locale_name_thread (void)
     for (i = 0; i < SIZEOF (categories); i++)
       {
         int category_mask = categories[i].mask;
-        locale_t locale = newlocale (LC_ALL_MASK, "fr_FR.UTF-8", NULL);
-        if (locale != NULL)
+        locale_t loc = newlocale (LC_ALL_MASK, "fr_FR.UTF-8", NULL);
+        if (loc != NULL)
           {
-            locale = newlocale (category_mask, "de_DE.UTF-8", locale);
-            if (locale != NULL)
+            locale_t locale = newlocale (category_mask, "de_DE.UTF-8", loc);
+            if (locale == NULL)
+              freelocale (loc);
+            else
               {
                 unsigned int j;
 
@@ -275,6 +285,8 @@ test_locale_name_thread (void)
                     else
                       ASSERT (strcmp (name_j, "fr_FR.UTF-8") == 0);
                   }
+                uselocale (LC_GLOBAL_LOCALE);
+                freelocale (locale);
               }
           }
       }
@@ -444,6 +456,7 @@ test_locale_name_thread (void)
                 ASSERT (strcmp (unsaved_names[j][i], name) == 0);
               }
             uselocale (LC_GLOBAL_LOCALE);
+            freelocale (locale);
           }
       }
     /* Verify the unsaved_names are still valid.  */
@@ -453,7 +466,10 @@ test_locale_name_thread (void)
           unsigned int i;
 
           for (i = 0; i < SIZEOF (categories); i++)
-            ASSERT (strcmp (unsaved_names[j][i], saved_names[j][i]) == 0);
+            {
+              ASSERT (strcmp (unsaved_names[j][i], saved_names[j][i]) == 0);
+              free (saved_names[j][i]);
+            }
         }
   }
 #else
@@ -590,6 +606,8 @@ test_locale_name_posix (void)
         uselocale (locale);
         name = gl_locale_name_posix (LC_MESSAGES, "LC_MESSAGES");
         ASSERT (strcmp (name, "C") == 0);
+        uselocale (LC_GLOBAL_LOCALE);
+        freelocale (locale);
       }
   }
 #endif
@@ -702,6 +720,8 @@ test_locale_name_environ (void)
         uselocale (locale);
         name = gl_locale_name_environ (LC_MESSAGES, "LC_MESSAGES");
         ASSERT (strcmp (name, "C") == 0);
+        uselocale (LC_GLOBAL_LOCALE);
+        freelocale (locale);
       }
   }
 #endif
@@ -729,6 +749,8 @@ test_locale_name_default (void)
       {
         uselocale (locale);
         ASSERT (strcmp (gl_locale_name_default (), name) == 0);
+        uselocale (LC_GLOBAL_LOCALE);
+        freelocale (locale);
       }
   }
 #endif
diff --git a/gettext-tools/gnulib-tests/test-lock.c b/gettext-tools/gnulib-tests/test-lock.c
index a992f64..cb734b4 100644
--- a/gettext-tools/gnulib-tests/test-lock.c
+++ b/gettext-tools/gnulib-tests/test-lock.c
@@ -1,5 +1,5 @@
 /* Test of locking in multithreaded situations.
-   Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-log10.c b/gettext-tools/gnulib-tests/test-log10.c
index d939151..5cf21c5 100644
--- a/gettext-tools/gnulib-tests/test-log10.c
+++ b/gettext-tools/gnulib-tests/test-log10.c
@@ -1,5 +1,5 @@
 /* Test of log10() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/test-log10.h b/gettext-tools/gnulib-tests/test-log10.h
index cd51640..9854418 100644
--- a/gettext-tools/gnulib-tests/test-log10.h
+++ b/gettext-tools/gnulib-tests/test-log10.h
@@ -1,5 +1,5 @@
 /* Test of log10*() function family.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 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
diff --git a/gettext-tools/gnulib-tests/test-lseek.c b/gettext-tools/gnulib-tests/test-lseek.c
index c5e9188..f748435 100644
--- a/gettext-tools/gnulib-tests/test-lseek.c
+++ b/gettext-tools/gnulib-tests/test-lseek.c
@@ -1,5 +1,5 @@
 /* Test of lseek() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-lstat.c b/gettext-tools/gnulib-tests/test-lstat.c
index 0e7597e..86ff465 100644
--- a/gettext-tools/gnulib-tests/test-lstat.c
+++ b/gettext-tools/gnulib-tests/test-lstat.c
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-lstat.h b/gettext-tools/gnulib-tests/test-lstat.h
index d5ba7a8..4eb9036 100644
--- a/gettext-tools/gnulib-tests/test-lstat.h
+++ b/gettext-tools/gnulib-tests/test-lstat.h
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-malloca.c b/gettext-tools/gnulib-tests/test-malloca.c
index 717ede0..e9ab83d 100644
--- a/gettext-tools/gnulib-tests/test-malloca.c
+++ b/gettext-tools/gnulib-tests/test-malloca.c
@@ -1,5 +1,5 @@
 /* Test of safe automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-math.c b/gettext-tools/gnulib-tests/test-math.c
index 7ac8b9a..de73b31 100644
--- a/gettext-tools/gnulib-tests/test-math.c
+++ b/gettext-tools/gnulib-tests/test-math.c
@@ -1,5 +1,5 @@
 /* Test of <math.h> substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-mbrtowc-w32.c b/gettext-tools/gnulib-tests/test-mbrtowc-w32.c
index efb1ddd..f637330 100644
--- a/gettext-tools/gnulib-tests/test-mbrtowc-w32.c
+++ b/gettext-tools/gnulib-tests/test-mbrtowc-w32.c
@@ -1,5 +1,5 @@
 /* Test of conversion of multibyte character to wide character.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-mbrtowc.c b/gettext-tools/gnulib-tests/test-mbrtowc.c
index d24b93e..f7fed6a 100644
--- a/gettext-tools/gnulib-tests/test-mbrtowc.c
+++ b/gettext-tools/gnulib-tests/test-mbrtowc.c
@@ -1,5 +1,5 @@
 /* Test of conversion of multibyte character to wide character.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
@@ -72,6 +72,10 @@ main (int argc, char *argv[])
     for (c = 0; c < 0x100; c++)
       switch (c)
         {
+        default:
+          if (! (c && 1 < argc && argv[1][0] == '5'))
+            break;
+          /* Fall through.  */
         case '\t': case '\v': case '\f':
         case ' ': case '!': case '"': case '#': case '%':
         case '&': case '\'': case '(': case ')': case '*':
@@ -93,7 +97,8 @@ main (int argc, char *argv[])
         case 'p': case 'q': case 'r': case 's': case 't':
         case 'u': case 'v': case 'w': case 'x': case 'y':
         case 'z': case '{': case '|': case '}': case '~':
-          /* c is in the ISO C "basic character set".  */
+          /* c is in the ISO C "basic character set", or argv[1] starts
+             with '5' so we are testing all nonnull bytes.  */
           buf[0] = c;
           wc = (wchar_t) 0xBADFACE;
           ret = mbrtowc (&wc, buf, 1, &state);
@@ -334,6 +339,10 @@ main (int argc, char *argv[])
           ASSERT (mbsinit (&state));
         }
         return 0;
+
+      case '5':
+        /* C locale; tested above.  */
+        return 0;
       }
 
   return 1;
diff --git a/gettext-tools/gnulib-tests/test-mbrtowc5.sh b/gettext-tools/gnulib-tests/test-mbrtowc5.sh
new file mode 100755
index 0000000..c10b228
--- /dev/null
+++ b/gettext-tools/gnulib-tests/test-mbrtowc5.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Test whether the POSIX locale has encoding errors.
+LC_ALL=C \
+./test-mbrtowc${EXEEXT} 5 || exit
+LC_ALL=POSIX \
+./test-mbrtowc${EXEEXT} 5
diff --git a/gettext-tools/gnulib-tests/test-mbsinit.c b/gettext-tools/gnulib-tests/test-mbsinit.c
index 98db1f1..8cd1c4d 100644
--- a/gettext-tools/gnulib-tests/test-mbsinit.c
+++ b/gettext-tools/gnulib-tests/test-mbsinit.c
@@ -1,5 +1,5 @@
 /* Test of test for initial conversion state.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-mbsrtowcs.c b/gettext-tools/gnulib-tests/test-mbsrtowcs.c
index cb394f5..aef88a3 100644
--- a/gettext-tools/gnulib-tests/test-mbsrtowcs.c
+++ b/gettext-tools/gnulib-tests/test-mbsrtowcs.c
@@ -1,5 +1,5 @@
 /* Test of conversion of string to wide string.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-mbsstr1.c b/gettext-tools/gnulib-tests/test-mbsstr1.c
index b00d533..8b1ac0a 100644
--- a/gettext-tools/gnulib-tests/test-mbsstr1.c
+++ b/gettext-tools/gnulib-tests/test-mbsstr1.c
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-mbsstr2.c b/gettext-tools/gnulib-tests/test-mbsstr2.c
index 6a80ebb..919e47c 100644
--- a/gettext-tools/gnulib-tests/test-mbsstr2.c
+++ b/gettext-tools/gnulib-tests/test-mbsstr2.c
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-mbsstr3.c b/gettext-tools/gnulib-tests/test-mbsstr3.c
index 4f56bf3..622f0ec 100644
--- a/gettext-tools/gnulib-tests/test-mbsstr3.c
+++ b/gettext-tools/gnulib-tests/test-mbsstr3.c
@@ -1,5 +1,5 @@
 /* Test of searching in a string.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-memchr.c b/gettext-tools/gnulib-tests/test-memchr.c
index bc1acf9..1526ed2 100644
--- a/gettext-tools/gnulib-tests/test-memchr.c
+++ b/gettext-tools/gnulib-tests/test-memchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2016 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-open.c b/gettext-tools/gnulib-tests/test-open.c
index d169e22..d9e2e27 100644
--- a/gettext-tools/gnulib-tests/test-open.c
+++ b/gettext-tools/gnulib-tests/test-open.c
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-open.h b/gettext-tools/gnulib-tests/test-open.h
index 2fbcd17..faaff0f 100644
--- a/gettext-tools/gnulib-tests/test-open.h
+++ b/gettext-tools/gnulib-tests/test-open.h
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-pathmax.c b/gettext-tools/gnulib-tests/test-pathmax.c
index 14eb1ee..ac4a393 100644
--- a/gettext-tools/gnulib-tests/test-pathmax.c
+++ b/gettext-tools/gnulib-tests/test-pathmax.c
@@ -1,5 +1,5 @@
 /* Test of "pathmax.h".
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-pipe-filter-ii1.c b/gettext-tools/gnulib-tests/test-pipe-filter-ii1.c
index f7ddfc3..5096673 100644
--- a/gettext-tools/gnulib-tests/test-pipe-filter-ii1.c
+++ b/gettext-tools/gnulib-tests/test-pipe-filter-ii1.c
@@ -1,5 +1,5 @@
 /* Test of filtering of data through a subprocess.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-pipe-filter-ii2-child.c b/gettext-tools/gnulib-tests/test-pipe-filter-ii2-child.c
index 89e1011..68c5c31 100644
--- a/gettext-tools/gnulib-tests/test-pipe-filter-ii2-child.c
+++ b/gettext-tools/gnulib-tests/test-pipe-filter-ii2-child.c
@@ -1,6 +1,6 @@
 /* Child program invoked by test-pipe-filter-ii2-main.
 
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Paolo Bonzini <bonzini@gnu.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-pipe-filter-ii2-main.c b/gettext-tools/gnulib-tests/test-pipe-filter-ii2-main.c
index e23b13f..60a3752 100644
--- a/gettext-tools/gnulib-tests/test-pipe-filter-ii2-main.c
+++ b/gettext-tools/gnulib-tests/test-pipe-filter-ii2-main.c
@@ -1,6 +1,6 @@
 /* Test harness for pipe-filter-ii.
 
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Paolo Bonzini <bonzini@gnu.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-pipe-filter-ii2.sh b/gettext-tools/gnulib-tests/test-pipe-filter-ii2.sh
index 81b2188..0ec8168 100755
--- a/gettext-tools/gnulib-tests/test-pipe-filter-ii2.sh
+++ b/gettext-tools/gnulib-tests/test-pipe-filter-ii2.sh
@@ -2,7 +2,7 @@
 
 # pipe-filter test driver.
 #
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 Free Software Foundation, Inc.
 # Written by Paolo Bonzini <bonzini@gnu.org>, 2009.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-pipe2.c b/gettext-tools/gnulib-tests/test-pipe2.c
index 88b9bf1..9bbeb25 100644
--- a/gettext-tools/gnulib-tests/test-pipe2.c
+++ b/gettext-tools/gnulib-tests/test-pipe2.c
@@ -1,5 +1,5 @@
 /* Test of pipe2.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-posix_spawn1.c b/gettext-tools/gnulib-tests/test-posix_spawn1.c
index c72ae44..ddf5b99 100644
--- a/gettext-tools/gnulib-tests/test-posix_spawn1.c
+++ b/gettext-tools/gnulib-tests/test-posix_spawn1.c
@@ -1,5 +1,5 @@
 /* Test of posix_spawn() function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-posix_spawn2.c b/gettext-tools/gnulib-tests/test-posix_spawn2.c
index 1d76014..041e0bb 100644
--- a/gettext-tools/gnulib-tests/test-posix_spawn2.c
+++ b/gettext-tools/gnulib-tests/test-posix_spawn2.c
@@ -1,5 +1,5 @@
 /* Test of posix_spawn() function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addclose.c b/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addclose.c
index 1e4c986..9c613f9 100644
--- a/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addclose.c
+++ b/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addclose.c
@@ -1,5 +1,5 @@
 /* Test posix_spawn_file_actions_addclose() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_adddup2.c b/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_adddup2.c
index 9526e2d..61ca4b3 100644
--- a/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_adddup2.c
+++ b/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_adddup2.c
@@ -1,5 +1,5 @@
 /* Test posix_spawn_file_actions_adddup2() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addopen.c b/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addopen.c
index cb5c8c4..b387dbd 100644
--- a/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addopen.c
+++ b/gettext-tools/gnulib-tests/test-posix_spawn_file_actions_addopen.c
@@ -1,5 +1,5 @@
 /* Test posix_spawn_file_actions_addopen() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-pow.c b/gettext-tools/gnulib-tests/test-pow.c
index ed51502..6a40177 100644
--- a/gettext-tools/gnulib-tests/test-pow.c
+++ b/gettext-tools/gnulib-tests/test-pow.c
@@ -1,5 +1,5 @@
 /* Test of pow() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/test-quotearg-simple.c b/gettext-tools/gnulib-tests/test-quotearg-simple.c
index 516e890..6bb4b35 100644
--- a/gettext-tools/gnulib-tests/test-quotearg-simple.c
+++ b/gettext-tools/gnulib-tests/test-quotearg-simple.c
@@ -1,5 +1,5 @@
 /* Test of quotearg family of functions.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-quotearg.h b/gettext-tools/gnulib-tests/test-quotearg.h
index e1bb659..7eee6b5 100644
--- a/gettext-tools/gnulib-tests/test-quotearg.h
+++ b/gettext-tools/gnulib-tests/test-quotearg.h
@@ -1,5 +1,5 @@
 /* Test of quotearg family of functions.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-raise.c b/gettext-tools/gnulib-tests/test-raise.c
index 7456a90..b793e97 100644
--- a/gettext-tools/gnulib-tests/test-raise.c
+++ b/gettext-tools/gnulib-tests/test-raise.c
@@ -1,5 +1,5 @@
 /* Test raising a signal.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-rawmemchr.c b/gettext-tools/gnulib-tests/test-rawmemchr.c
index c9022d3..4f4ec7b 100644
--- a/gettext-tools/gnulib-tests/test-rawmemchr.c
+++ b/gettext-tools/gnulib-tests/test-rawmemchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2016 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-read-file.c b/gettext-tools/gnulib-tests/test-read-file.c
index f8b160f..ab13f14 100644
--- a/gettext-tools/gnulib-tests/test-read-file.c
+++ b/gettext-tools/gnulib-tests/test-read-file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007, 2010-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2006-2007, 2010-2016 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-read.c b/gettext-tools/gnulib-tests/test-read.c
index 892a617..8b36808 100644
--- a/gettext-tools/gnulib-tests/test-read.c
+++ b/gettext-tools/gnulib-tests/test-read.c
@@ -1,5 +1,5 @@
 /* Test the read() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-readlink.c b/gettext-tools/gnulib-tests/test-readlink.c
index 4240108..fdff6e1 100644
--- a/gettext-tools/gnulib-tests/test-readlink.c
+++ b/gettext-tools/gnulib-tests/test-readlink.c
@@ -1,5 +1,5 @@
 /* Tests of readlink.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-readlink.h b/gettext-tools/gnulib-tests/test-readlink.h
index ad34c55..cba98f6 100644
--- a/gettext-tools/gnulib-tests/test-readlink.h
+++ b/gettext-tools/gnulib-tests/test-readlink.h
@@ -1,5 +1,5 @@
 /* Tests of readlink.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-rmdir.c b/gettext-tools/gnulib-tests/test-rmdir.c
index 52cfa42..192525c 100644
--- a/gettext-tools/gnulib-tests/test-rmdir.c
+++ b/gettext-tools/gnulib-tests/test-rmdir.c
@@ -1,5 +1,5 @@
 /* Tests of rmdir.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-rmdir.h b/gettext-tools/gnulib-tests/test-rmdir.h
index 9c83a10..5cccd05 100644
--- a/gettext-tools/gnulib-tests/test-rmdir.h
+++ b/gettext-tools/gnulib-tests/test-rmdir.h
@@ -1,5 +1,5 @@
 /* Tests of rmdir.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sameacls.c b/gettext-tools/gnulib-tests/test-sameacls.c
index bea6d3e..4f78e09 100644
--- a/gettext-tools/gnulib-tests/test-sameacls.c
+++ b/gettext-tools/gnulib-tests/test-sameacls.c
@@ -1,5 +1,5 @@
 /* Test whether two files have the same ACLs.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sched.c b/gettext-tools/gnulib-tests/test-sched.c
index d6f5752..52e0a8a 100644
--- a/gettext-tools/gnulib-tests/test-sched.c
+++ b/gettext-tools/gnulib-tests/test-sched.c
@@ -1,5 +1,5 @@
 /* Test of <sched.h> substitute.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-set-mode-acl.c b/gettext-tools/gnulib-tests/test-set-mode-acl.c
index a282e25..028a09b 100644
--- a/gettext-tools/gnulib-tests/test-set-mode-acl.c
+++ b/gettext-tools/gnulib-tests/test-set-mode-acl.c
@@ -1,5 +1,5 @@
 /* Test of setting an ACL equivalent to a mode.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-setenv.c b/gettext-tools/gnulib-tests/test-setenv.c
index a7ef488..519dc27 100644
--- a/gettext-tools/gnulib-tests/test-setenv.c
+++ b/gettext-tools/gnulib-tests/test-setenv.c
@@ -1,5 +1,5 @@
 /* Tests of setenv.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-setlocale1.c b/gettext-tools/gnulib-tests/test-setlocale1.c
index 6e0ef9d..143c0d8 100644
--- a/gettext-tools/gnulib-tests/test-setlocale1.c
+++ b/gettext-tools/gnulib-tests/test-setlocale1.c
@@ -1,5 +1,5 @@
 /* Test of setting the current locale.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
@@ -54,6 +54,8 @@ main (int argc, char *argv[])
 
   /* Test that the two results are the same.  */
   ASSERT (strcmp (name1, name2) == 0);
+  free (name1);
+  free (name2);
 
   return 0;
 }
diff --git a/gettext-tools/gnulib-tests/test-setlocale2.c b/gettext-tools/gnulib-tests/test-setlocale2.c
index 1bd8a5c..52e65d8 100644
--- a/gettext-tools/gnulib-tests/test-setlocale2.c
+++ b/gettext-tools/gnulib-tests/test-setlocale2.c
@@ -1,5 +1,5 @@
 /* Test of setting the current locale.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sh-quote.c b/gettext-tools/gnulib-tests/test-sh-quote.c
index 1b36a84..a2633ba 100644
--- a/gettext-tools/gnulib-tests/test-sh-quote.c
+++ b/gettext-tools/gnulib-tests/test-sh-quote.c
@@ -1,5 +1,5 @@
 /* Test of sh-quote module.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sigaction.c b/gettext-tools/gnulib-tests/test-sigaction.c
index ec0f051..27c1ecc 100644
--- a/gettext-tools/gnulib-tests/test-sigaction.c
+++ b/gettext-tools/gnulib-tests/test-sigaction.c
@@ -1,5 +1,5 @@
 /* Test of sigaction() function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-signal-h.c b/gettext-tools/gnulib-tests/test-signal-h.c
index 836e1c8..b050839 100644
--- a/gettext-tools/gnulib-tests/test-signal-h.c
+++ b/gettext-tools/gnulib-tests/test-signal-h.c
@@ -1,5 +1,5 @@
 /* Test of <signal.h> substitute.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-signbit.c b/gettext-tools/gnulib-tests/test-signbit.c
index 80e9a08..878b7eb 100644
--- a/gettext-tools/gnulib-tests/test-signbit.c
+++ b/gettext-tools/gnulib-tests/test-signbit.c
@@ -1,5 +1,5 @@
 /* Test of signbit() substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sigpipe.c b/gettext-tools/gnulib-tests/test-sigpipe.c
index d5e7e9c..00707aa 100644
--- a/gettext-tools/gnulib-tests/test-sigpipe.c
+++ b/gettext-tools/gnulib-tests/test-sigpipe.c
@@ -1,5 +1,5 @@
 /* Test of SIGPIPE handling.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sigprocmask.c b/gettext-tools/gnulib-tests/test-sigprocmask.c
index c88e180..e759bf1 100644
--- a/gettext-tools/gnulib-tests/test-sigprocmask.c
+++ b/gettext-tools/gnulib-tests/test-sigprocmask.c
@@ -1,5 +1,5 @@
 /* Test of sigprocmask.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sleep.c b/gettext-tools/gnulib-tests/test-sleep.c
index fba2f46..64f681e 100644
--- a/gettext-tools/gnulib-tests/test-sleep.c
+++ b/gettext-tools/gnulib-tests/test-sleep.c
@@ -1,5 +1,5 @@
 /* Test of sleep() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-snprintf.c b/gettext-tools/gnulib-tests/test-snprintf.c
index c14a2c1..9041e4a 100644
--- a/gettext-tools/gnulib-tests/test-snprintf.c
+++ b/gettext-tools/gnulib-tests/test-snprintf.c
@@ -1,5 +1,5 @@
 /* Test of snprintf() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-spawn-pipe-child.c b/gettext-tools/gnulib-tests/test-spawn-pipe-child.c
index 2d354c2..5a8652b 100644
--- a/gettext-tools/gnulib-tests/test-spawn-pipe-child.c
+++ b/gettext-tools/gnulib-tests/test-spawn-pipe-child.c
@@ -1,5 +1,5 @@
 /* Child program invoked by test-spawn-pipe-main.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-spawn-pipe-main.c b/gettext-tools/gnulib-tests/test-spawn-pipe-main.c
index f0d94d7..2275238 100644
--- a/gettext-tools/gnulib-tests/test-spawn-pipe-main.c
+++ b/gettext-tools/gnulib-tests/test-spawn-pipe-main.c
@@ -1,5 +1,5 @@
 /* Test of create_pipe_bidi/wait_subprocess.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-spawn.c b/gettext-tools/gnulib-tests/test-spawn.c
index 080ad2f..e33ac47 100644
--- a/gettext-tools/gnulib-tests/test-spawn.c
+++ b/gettext-tools/gnulib-tests/test-spawn.c
@@ -1,5 +1,5 @@
 /* Test of <spawn.h> substitute.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-stat.c b/gettext-tools/gnulib-tests/test-stat.c
index c6af376..4510e59 100644
--- a/gettext-tools/gnulib-tests/test-stat.c
+++ b/gettext-tools/gnulib-tests/test-stat.c
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
@@ -30,6 +30,7 @@ SIGNATURE_CHECK (stat, int, (char const *, struct stat *));
 #include <fcntl.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 
diff --git a/gettext-tools/gnulib-tests/test-stat.h b/gettext-tools/gnulib-tests/test-stat.h
index c37fe6d..4cf6c6d 100644
--- a/gettext-tools/gnulib-tests/test-stat.h
+++ b/gettext-tools/gnulib-tests/test-stat.h
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
@@ -95,6 +95,7 @@ test_stat_func (int (*func) (char const *, struct stat *), bool print)
   ASSERT (unlink (BASE "link2") == 0);
   ASSERT (unlink (BASE "link3") == 0);
   ASSERT (unlink (BASE "link4") == 0);
+  free (cwd);
 
   return 0;
 }
diff --git a/gettext-tools/gnulib-tests/test-stdalign.c b/gettext-tools/gnulib-tests/test-stdalign.c
index 68b9ef1..0f240c5 100644
--- a/gettext-tools/gnulib-tests/test-stdalign.c
+++ b/gettext-tools/gnulib-tests/test-stdalign.c
@@ -1,5 +1,5 @@
 /* Test of <stdalign.h>.
-   Copyright 2009-2015 Free Software Foundation, Inc.
+   Copyright 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-stdbool.c b/gettext-tools/gnulib-tests/test-stdbool.c
index 1da25d0..45dc837 100644
--- a/gettext-tools/gnulib-tests/test-stdbool.c
+++ b/gettext-tools/gnulib-tests/test-stdbool.c
@@ -1,5 +1,5 @@
 /* Test of <stdbool.h> substitute.
-   Copyright (C) 2002-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-stddef.c b/gettext-tools/gnulib-tests/test-stddef.c
index aa6ae54..bfb72a0 100644
--- a/gettext-tools/gnulib-tests/test-stddef.c
+++ b/gettext-tools/gnulib-tests/test-stddef.c
@@ -1,5 +1,5 @@
 /* Test of <stddef.h> substitute.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-stdint.c b/gettext-tools/gnulib-tests/test-stdint.c
index 8d54db2..7705fc7 100644
--- a/gettext-tools/gnulib-tests/test-stdint.c
+++ b/gettext-tools/gnulib-tests/test-stdint.c
@@ -1,5 +1,5 @@
 /* Test of <stdint.h> substitute.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-tools/gnulib-tests/test-stdio.c b/gettext-tools/gnulib-tests/test-stdio.c
index cbec2a6..6cde888 100644
--- a/gettext-tools/gnulib-tests/test-stdio.c
+++ b/gettext-tools/gnulib-tests/test-stdio.c
@@ -1,5 +1,5 @@
 /* Test of <stdio.h> substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-stdlib.c b/gettext-tools/gnulib-tests/test-stdlib.c
index b2da7ec..a1fc0d8 100644
--- a/gettext-tools/gnulib-tests/test-stdlib.c
+++ b/gettext-tools/gnulib-tests/test-stdlib.c
@@ -1,5 +1,5 @@
 /* Test of <stdlib.h> substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-strchrnul.c b/gettext-tools/gnulib-tests/test-strchrnul.c
index 8d7dcda..14e5ea6 100644
--- a/gettext-tools/gnulib-tests/test-strchrnul.c
+++ b/gettext-tools/gnulib-tests/test-strchrnul.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2008-2016 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-strerror.c b/gettext-tools/gnulib-tests/test-strerror.c
index 755ffba..80ffe1c 100644
--- a/gettext-tools/gnulib-tests/test-strerror.c
+++ b/gettext-tools/gnulib-tests/test-strerror.c
@@ -1,5 +1,5 @@
 /* Test of strerror() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-striconv.c b/gettext-tools/gnulib-tests/test-striconv.c
index fc9b200..9b71b69 100644
--- a/gettext-tools/gnulib-tests/test-striconv.c
+++ b/gettext-tools/gnulib-tests/test-striconv.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-striconveh.c b/gettext-tools/gnulib-tests/test-striconveh.c
index a4b48fb..de5e657 100644
--- a/gettext-tools/gnulib-tests/test-striconveh.c
+++ b/gettext-tools/gnulib-tests/test-striconveh.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion with error handling.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-striconveha.c b/gettext-tools/gnulib-tests/test-striconveha.c
index 19e4318..63c950f 100644
--- a/gettext-tools/gnulib-tests/test-striconveha.c
+++ b/gettext-tools/gnulib-tests/test-striconveha.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion with error handling and autodetection.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-string.c b/gettext-tools/gnulib-tests/test-string.c
index 647d3b9..f4c60f7 100644
--- a/gettext-tools/gnulib-tests/test-string.c
+++ b/gettext-tools/gnulib-tests/test-string.c
@@ -1,5 +1,5 @@
 /* Test of <string.h> substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-strnlen.c b/gettext-tools/gnulib-tests/test-strnlen.c
index 19e41cf..ee5bd78 100644
--- a/gettext-tools/gnulib-tests/test-strnlen.c
+++ b/gettext-tools/gnulib-tests/test-strnlen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2010-2016 Free Software Foundation, Inc.
  * Written by Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-strstr.c b/gettext-tools/gnulib-tests/test-strstr.c
index 70ebf50..eaefb06 100644
--- a/gettext-tools/gnulib-tests/test-strstr.c
+++ b/gettext-tools/gnulib-tests/test-strstr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc.
  * Written by Bruno Haible and Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-strtol.c b/gettext-tools/gnulib-tests/test-strtol.c
index 1820dd9..12d90d7 100644
--- a/gettext-tools/gnulib-tests/test-strtol.c
+++ b/gettext-tools/gnulib-tests/test-strtol.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-strtoul.c b/gettext-tools/gnulib-tests/test-strtoul.c
index 3bb1cbf..bbf53f7 100644
--- a/gettext-tools/gnulib-tests/test-strtoul.c
+++ b/gettext-tools/gnulib-tests/test-strtoul.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2015 Free Software Foundation, Inc.
+ * Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-symlink.c b/gettext-tools/gnulib-tests/test-symlink.c
index 7a63391..ad13b93 100644
--- a/gettext-tools/gnulib-tests/test-symlink.c
+++ b/gettext-tools/gnulib-tests/test-symlink.c
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-symlink.h b/gettext-tools/gnulib-tests/test-symlink.h
index 4dc741a..fc064e8 100644
--- a/gettext-tools/gnulib-tests/test-symlink.h
+++ b/gettext-tools/gnulib-tests/test-symlink.h
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sys_select.c b/gettext-tools/gnulib-tests/test-sys_select.c
index e9b4b7c..39a878f 100644
--- a/gettext-tools/gnulib-tests/test-sys_select.c
+++ b/gettext-tools/gnulib-tests/test-sys_select.c
@@ -1,5 +1,5 @@
 /* Test of <sys/select.h> substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sys_stat.c b/gettext-tools/gnulib-tests/test-sys_stat.c
index e4194a1..8a3af94 100644
--- a/gettext-tools/gnulib-tests/test-sys_stat.c
+++ b/gettext-tools/gnulib-tests/test-sys_stat.c
@@ -1,5 +1,5 @@
 /* Test of <sys/stat.h> substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sys_time.c b/gettext-tools/gnulib-tests/test-sys_time.c
index 653ff46..44535b9 100644
--- a/gettext-tools/gnulib-tests/test-sys_time.c
+++ b/gettext-tools/gnulib-tests/test-sys_time.c
@@ -1,5 +1,5 @@
 /* Test of <sys/time.h> substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sys_types.c b/gettext-tools/gnulib-tests/test-sys_types.c
index 1ef3b90..7f8fb6d 100644
--- a/gettext-tools/gnulib-tests/test-sys_types.c
+++ b/gettext-tools/gnulib-tests/test-sys_types.c
@@ -1,5 +1,5 @@
 /* Test of <sys/types.h> substitute.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sys_wait.c b/gettext-tools/gnulib-tests/test-sys_wait.c
index 3382fdf..f814ff3 100644
--- a/gettext-tools/gnulib-tests/test-sys_wait.c
+++ b/gettext-tools/gnulib-tests/test-sys_wait.c
@@ -1,5 +1,5 @@
 /* Test of <sys/wait.h> substitute.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-sys_wait.h b/gettext-tools/gnulib-tests/test-sys_wait.h
index e4a79b5..7389be4 100644
--- a/gettext-tools/gnulib-tests/test-sys_wait.h
+++ b/gettext-tools/gnulib-tests/test-sys_wait.h
@@ -1,5 +1,5 @@
 /* Test of macros shared between <sys/wait.h> and <stdlib.h>.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/test-thread_create.c b/gettext-tools/gnulib-tests/test-thread_create.c
index c6dbc7b..f6b7e56 100644
--- a/gettext-tools/gnulib-tests/test-thread_create.c
+++ b/gettext-tools/gnulib-tests/test-thread_create.c
@@ -1,5 +1,5 @@
 /* Test of gl_thread_create () macro.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-thread_self.c b/gettext-tools/gnulib-tests/test-thread_self.c
index 1d2d05e..85c4185 100644
--- a/gettext-tools/gnulib-tests/test-thread_self.c
+++ b/gettext-tools/gnulib-tests/test-thread_self.c
@@ -1,5 +1,5 @@
 /* Test of gl_thread_self () macro.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-time.c b/gettext-tools/gnulib-tests/test-time.c
index 25bdcf0..dec2b13 100644
--- a/gettext-tools/gnulib-tests/test-time.c
+++ b/gettext-tools/gnulib-tests/test-time.c
@@ -1,5 +1,5 @@
 /* Test of <time.h> substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-tls.c b/gettext-tools/gnulib-tests/test-tls.c
index bee567e..36d5e06 100644
--- a/gettext-tools/gnulib-tests/test-tls.c
+++ b/gettext-tools/gnulib-tests/test-tls.c
@@ -1,5 +1,5 @@
 /* Test of thread-local storage in multithreaded situations.
-   Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-unistd.c b/gettext-tools/gnulib-tests/test-unistd.c
index 930b5e2..463ef57 100644
--- a/gettext-tools/gnulib-tests/test-unistd.c
+++ b/gettext-tools/gnulib-tests/test-unistd.c
@@ -1,5 +1,5 @@
 /* Test of <unistd.h> substitute.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-unsetenv.c b/gettext-tools/gnulib-tests/test-unsetenv.c
index 235e185..fe4548d 100644
--- a/gettext-tools/gnulib-tests/test-unsetenv.c
+++ b/gettext-tools/gnulib-tests/test-unsetenv.c
@@ -1,5 +1,5 @@
 /* Tests of unsetenv.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-vasnprintf-posix.c b/gettext-tools/gnulib-tests/test-vasnprintf-posix.c
index bf36f1f..eb292ea 100644
--- a/gettext-tools/gnulib-tests/test-vasnprintf-posix.c
+++ b/gettext-tools/gnulib-tests/test-vasnprintf-posix.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-vasnprintf.c b/gettext-tools/gnulib-tests/test-vasnprintf.c
index 8ff5900..a75c004 100644
--- a/gettext-tools/gnulib-tests/test-vasnprintf.c
+++ b/gettext-tools/gnulib-tests/test-vasnprintf.c
@@ -1,5 +1,5 @@
 /* Test of vasnprintf() and asnprintf() functions.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-vasprintf.c b/gettext-tools/gnulib-tests/test-vasprintf.c
index b304275..ebcbfc4 100644
--- a/gettext-tools/gnulib-tests/test-vasprintf.c
+++ b/gettext-tools/gnulib-tests/test-vasprintf.c
@@ -1,5 +1,5 @@
 /* Test of vasprintf() and asprintf() functions.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-verify.c b/gettext-tools/gnulib-tests/test-verify.c
index 640dc42..d7ca053 100644
--- a/gettext-tools/gnulib-tests/test-verify.c
+++ b/gettext-tools/gnulib-tests/test-verify.c
@@ -1,6 +1,6 @@
 /* Test the "verify" module.
 
-   Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-vsnprintf.c b/gettext-tools/gnulib-tests/test-vsnprintf.c
index a37ace5..0a2ff02 100644
--- a/gettext-tools/gnulib-tests/test-vsnprintf.c
+++ b/gettext-tools/gnulib-tests/test-vsnprintf.c
@@ -1,5 +1,5 @@
 /* Test of vsnprintf() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-wchar.c b/gettext-tools/gnulib-tests/test-wchar.c
index e857ab5..e118048 100644
--- a/gettext-tools/gnulib-tests/test-wchar.c
+++ b/gettext-tools/gnulib-tests/test-wchar.c
@@ -1,5 +1,5 @@
 /* Test of <wchar.h> substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-wcrtomb-w32.c b/gettext-tools/gnulib-tests/test-wcrtomb-w32.c
index d8bcf75..0570c73 100644
--- a/gettext-tools/gnulib-tests/test-wcrtomb-w32.c
+++ b/gettext-tools/gnulib-tests/test-wcrtomb-w32.c
@@ -1,5 +1,5 @@
 /* Test of conversion of wide character to multibyte character.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-wcrtomb.c b/gettext-tools/gnulib-tests/test-wcrtomb.c
index 902a4e1..e1d2bb4 100644
--- a/gettext-tools/gnulib-tests/test-wcrtomb.c
+++ b/gettext-tools/gnulib-tests/test-wcrtomb.c
@@ -1,5 +1,5 @@
 /* Test of conversion of wide character to multibyte character.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/test-wctype-h.c b/gettext-tools/gnulib-tests/test-wctype-h.c
index 7466e59..b401091 100644
--- a/gettext-tools/gnulib-tests/test-wctype-h.c
+++ b/gettext-tools/gnulib-tests/test-wctype-h.c
@@ -1,5 +1,5 @@
 /* Test of <wctype.h> substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-wcwidth.c b/gettext-tools/gnulib-tests/test-wcwidth.c
index 9fad785..5a0d853 100644
--- a/gettext-tools/gnulib-tests/test-wcwidth.c
+++ b/gettext-tools/gnulib-tests/test-wcwidth.c
@@ -1,5 +1,5 @@
 /* Test of wcwidth() function.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/test-write.c b/gettext-tools/gnulib-tests/test-write.c
index 6c1ea0c..a9e6331 100644
--- a/gettext-tools/gnulib-tests/test-write.c
+++ b/gettext-tools/gnulib-tests/test-write.c
@@ -1,5 +1,5 @@
 /* Test the write() function.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/gnulib-tests/test-xalloc-die.c b/gettext-tools/gnulib-tests/test-xalloc-die.c
index 16d8636..9329750 100644
--- a/gettext-tools/gnulib-tests/test-xalloc-die.c
+++ b/gettext-tools/gnulib-tests/test-xalloc-die.c
@@ -1,5 +1,5 @@
 /* Test of xalloc_die() function.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/gnulib-tests/test-xalloc-die.sh b/gettext-tools/gnulib-tests/test-xalloc-die.sh
index 76cdecd..fba601f 100755
--- a/gettext-tools/gnulib-tests/test-xalloc-die.sh
+++ b/gettext-tools/gnulib-tests/test-xalloc-die.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Test suite for xalloc_die.
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/test-xmemdup0.c b/gettext-tools/gnulib-tests/test-xmemdup0.c
new file mode 100644
index 0000000..bbe94ca
--- /dev/null
+++ b/gettext-tools/gnulib-tests/test-xmemdup0.c
@@ -0,0 +1,81 @@
+/* Test of xmemdup0() function.
+   Copyright (C) 2008-2016 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
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Eric Blake <ebb9@byu.net>, 2008.  */
+
+#include <config.h>
+
+#include "xmemdup0.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "progname.h"
+#include "macros.h"
+
+int
+main (int argc, char **argv)
+{
+  char buffer[10] = { 'a', 'b', 'c', 'd', '\0',
+                      'f', 'g', 'h', 'i', 'j'   };
+
+  set_program_name (argv[0]);
+
+  /* Empty string.  */
+  {
+    char *result = xmemdup0 (NULL, 0);
+    ASSERT (result);
+    ASSERT (!*result);
+    free (result);
+  }
+  {
+    char *result = xmemdup0 ("", 0);
+    ASSERT (result);
+    ASSERT (!*result);
+    free (result);
+  }
+
+  /* Various buffer lengths.  */
+  {
+    char *result = xmemdup0 (buffer, 4);
+    ASSERT (result);
+    ASSERT (strcmp (result, buffer) == 0);
+    free (result);
+  }
+  {
+    char *result = xmemdup0 (buffer, 5);
+    ASSERT (result);
+    ASSERT (strcmp (result, buffer) == 0);
+    ASSERT (result[5] == '\0');
+    free (result);
+  }
+  {
+    char *result = xmemdup0 (buffer, 9);
+    ASSERT (result);
+    ASSERT (memcmp (result, buffer, 9) == 0);
+    ASSERT (result[9] == '\0');
+    free (result);
+  }
+  {
+    char *result = xmemdup0 (buffer, 10);
+    ASSERT (result);
+    ASSERT (memcmp (result, buffer, 10) == 0);
+    ASSERT (result[10] == '\0');
+    free (result);
+  }
+
+  return 0;
+}
diff --git a/gettext-tools/gnulib-tests/test-xvasprintf.c b/gettext-tools/gnulib-tests/test-xvasprintf.c
index 9e33844..985fe2e 100644
--- a/gettext-tools/gnulib-tests/test-xvasprintf.c
+++ b/gettext-tools/gnulib-tests/test-xvasprintf.c
@@ -1,5 +1,5 @@
 /* Test of xvasprintf() and xasprintf() functions.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c b/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c
index f37be0d..8efbed8 100644
--- a/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c
+++ b/gettext-tools/gnulib-tests/uniconv/test-u8-conv-from-enc.c
@@ -1,5 +1,5 @@
 /* Test of conversion to UTF-8 from legacy encodings.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/gnulib-tests/unilbrk/test-u8-width-linebreaks.c b/gettext-tools/gnulib-tests/unilbrk/test-u8-width-linebreaks.c
index 157860a..867ec23 100644
--- a/gettext-tools/gnulib-tests/unilbrk/test-u8-width-linebreaks.c
+++ b/gettext-tools/gnulib-tests/unilbrk/test-u8-width-linebreaks.c
@@ -1,5 +1,5 @@
 /* Test of line breaking of UTF-8 strings.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/uniname/test-uninames.c b/gettext-tools/gnulib-tests/uniname/test-uninames.c
index 2942d8d..b032472 100644
--- a/gettext-tools/gnulib-tests/uniname/test-uninames.c
+++ b/gettext-tools/gnulib-tests/uniname/test-uninames.c
@@ -1,5 +1,5 @@
 /* Test the Unicode character name functions.
-   Copyright (C) 2000-2003, 2005, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2000-2003, 2005, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/unistr/test-cmp.h b/gettext-tools/gnulib-tests/unistr/test-cmp.h
index aece9b0..919401c 100644
--- a/gettext-tools/gnulib-tests/unistr/test-cmp.h
+++ b/gettext-tools/gnulib-tests/unistr/test-cmp.h
@@ -1,5 +1,5 @@
 /* Test of uN_cmp() functions.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.c b/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.c
index f673ee8..f1fa748 100644
--- a/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.c
+++ b/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.c
@@ -1,5 +1,5 @@
 /* Test of u16_mbtouc() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.h b/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.h
index 7019b4a..c1197f4 100644
--- a/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.h
+++ b/gettext-tools/gnulib-tests/unistr/test-u16-mbtouc.h
@@ -1,5 +1,5 @@
 /* Test of u16_mbtouc() and u16_mbtouc_unsafe() functions.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/test-u8-check.c b/gettext-tools/gnulib-tests/unistr/test-u8-check.c
index fcf678c..f1fe900 100644
--- a/gettext-tools/gnulib-tests/unistr/test-u8-check.c
+++ b/gettext-tools/gnulib-tests/unistr/test-u8-check.c
@@ -1,5 +1,5 @@
 /* Test of u8_check() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/test-u8-cmp.c b/gettext-tools/gnulib-tests/unistr/test-u8-cmp.c
index 5606f0a..5b9f4c0 100644
--- a/gettext-tools/gnulib-tests/unistr/test-u8-cmp.c
+++ b/gettext-tools/gnulib-tests/unistr/test-u8-cmp.c
@@ -1,5 +1,5 @@
 /* Test of u8_cmp() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/test-u8-mblen.c b/gettext-tools/gnulib-tests/unistr/test-u8-mblen.c
index 3e68b66..e2ea3a8 100644
--- a/gettext-tools/gnulib-tests/unistr/test-u8-mblen.c
+++ b/gettext-tools/gnulib-tests/unistr/test-u8-mblen.c
@@ -1,5 +1,5 @@
 /* Test of u8_mblen() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/test-u8-mbtoucr.c b/gettext-tools/gnulib-tests/unistr/test-u8-mbtoucr.c
index 7f02e8b..7a7b0b9 100644
--- a/gettext-tools/gnulib-tests/unistr/test-u8-mbtoucr.c
+++ b/gettext-tools/gnulib-tests/unistr/test-u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Test of u8_mbtoucr() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/test-u8-prev.c b/gettext-tools/gnulib-tests/unistr/test-u8-prev.c
index 9e2a9ba..33342ae 100644
--- a/gettext-tools/gnulib-tests/unistr/test-u8-prev.c
+++ b/gettext-tools/gnulib-tests/unistr/test-u8-prev.c
@@ -1,5 +1,5 @@
 /* Test of u8_prev() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/test-u8-strlen.c b/gettext-tools/gnulib-tests/unistr/test-u8-strlen.c
index d4b3224..b53c15a 100644
--- a/gettext-tools/gnulib-tests/unistr/test-u8-strlen.c
+++ b/gettext-tools/gnulib-tests/unistr/test-u8-strlen.c
@@ -1,5 +1,5 @@
 /* Test of u8_strlen() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/test-u8-uctomb.c b/gettext-tools/gnulib-tests/unistr/test-u8-uctomb.c
index f586f04..bbc9418 100644
--- a/gettext-tools/gnulib-tests/unistr/test-u8-uctomb.c
+++ b/gettext-tools/gnulib-tests/unistr/test-u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Test of u8_uctomb() function.
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/gnulib-tests/unistr/u8-cmp.c b/gettext-tools/gnulib-tests/unistr/u8-cmp.c
index 5574e8c..990c7ac 100644
--- a/gettext-tools/gnulib-tests/unistr/u8-cmp.c
+++ b/gettext-tools/gnulib-tests/unistr/u8-cmp.c
@@ -1,5 +1,5 @@
 /* Compare pieces of UTF-8 strings.
-   Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-tests/unistr/u8-strlen.c b/gettext-tools/gnulib-tests/unistr/u8-strlen.c
index 5673ade..3180565 100644
--- a/gettext-tools/gnulib-tests/unistr/u8-strlen.c
+++ b/gettext-tools/gnulib-tests/unistr/u8-strlen.c
@@ -1,5 +1,5 @@
 /* Determine length of UTF-8 string.
-   Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/gnulib-tests/wcrtomb.c b/gettext-tools/gnulib-tests/wcrtomb.c
index b38d2e0..b931ee9 100644
--- a/gettext-tools/gnulib-tests/wcrtomb.c
+++ b/gettext-tools/gnulib-tests/wcrtomb.c
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/wctob.c b/gettext-tools/gnulib-tests/wctob.c
index 3ff6c7b..15e3ff3 100644
--- a/gettext-tools/gnulib-tests/wctob.c
+++ b/gettext-tools/gnulib-tests/wctob.c
@@ -1,5 +1,5 @@
 /* Convert wide character to unibyte character.
-   Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/wctomb-impl.h b/gettext-tools/gnulib-tests/wctomb-impl.h
index 41217d5..a6ed971 100644
--- a/gettext-tools/gnulib-tests/wctomb-impl.h
+++ b/gettext-tools/gnulib-tests/wctomb-impl.h
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/wctomb.c b/gettext-tools/gnulib-tests/wctomb.c
index 8022aa8..f1d14f5 100644
--- a/gettext-tools/gnulib-tests/wctomb.c
+++ b/gettext-tools/gnulib-tests/wctomb.c
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/gnulib-tests/zerosize-ptr.h b/gettext-tools/gnulib-tests/zerosize-ptr.h
index 76418aa..e6ff672 100644
--- a/gettext-tools/gnulib-tests/zerosize-ptr.h
+++ b/gettext-tools/gnulib-tests/zerosize-ptr.h
@@ -1,5 +1,5 @@
 /* Return a pointer to a zero-size object in memory.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/its/Makefile.am b/gettext-tools/its/Makefile.am
index e9679a2..6e5a5ec 100644
--- a/gettext-tools/its/Makefile.am
+++ b/gettext-tools/its/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/its subdirectory of GNU gettext
-## Copyright (C) 2015 Free Software Foundation, Inc.
+## Copyright (C) 2015-2016 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
diff --git a/gettext-tools/its/Makefile.in b/gettext-tools/its/Makefile.in
index 7cbefb3..87b016d 100644
--- a/gettext-tools/its/Makefile.in
+++ b/gettext-tools/its/Makefile.in
@@ -118,6 +118,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -154,6 +155,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-tools/its/glade.loc b/gettext-tools/its/glade.loc
index 128dc83..fcf688d 100644
--- a/gettext-tools/its/glade.loc
+++ b/gettext-tools/its/glade.loc
@@ -3,6 +3,7 @@
   <locatingRule name="Glade" pattern="*.glade">
     <documentRule localName="GTK-Interface" target="glade1.its"/>
     <documentRule localName="glade-interface" target="glade2.its"/>
+    <documentRule localName="interface" target="gtkbuilder.its"/>
   </locatingRule>
   <locatingRule name="Glade" pattern="*.glade2">
     <documentRule localName="glade-interface" target="glade2.its"/>
diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index dfbf40c..36bd700 100644
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gettext-tools/libgettextpo subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2011, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 1995-1998, 2000-2011, 2015-2016 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
@@ -100,7 +99,7 @@ libgettextpo_la_AUXSOURCES = \
 # Libtool's library version information for libgettextpo.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT=5
-LTV_REVISION=3
+LTV_REVISION=4
 LTV_AGE=5
 
 # How to build libgettextpo.la.
@@ -118,6 +117,11 @@ libgettextpo_la_SOURCES += ../woe32dll/gettextpo-exports.c
 libgettextpo_la_LDFLAGS += -Wl,--export-all-symbols
 endif
 
+# OS/2 does not support a DLL name longer than 8 characters.
+if OS2
+libgettextpo_la_LDFLAGS += -os2dllname gtpo
+endif
+
 # Version information according to Woe32 conventions.
 EXTRA_DIST += libgettextpo.rc
 if WOE32
diff --git a/gettext-tools/libgettextpo/Makefile.gnulib b/gettext-tools/libgettextpo/Makefile.gnulib
index 35561c1..c68e6f5 100644
--- a/gettext-tools/libgettextpo/Makefile.gnulib
+++ b/gettext-tools/libgettextpo/Makefile.gnulib
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -429,6 +429,14 @@ V_GPERF_0 = @echo "  GPERF   " $@;
 
 ## end   gnulib module gperf
 
+## begin gnulib module hard-locale
+
+libgnu_la_SOURCES += hard-locale.c
+
+EXTRA_DIST += hard-locale.h
+
+## end   gnulib module hard-locale
+
 ## begin gnulib module hash
 
 libgnu_la_SOURCES += hash.h hash.c
diff --git a/gettext-tools/libgettextpo/Makefile.in b/gettext-tools/libgettextpo/Makefile.in
index fd0f072..5f9550d 100644
--- a/gettext-tools/libgettextpo/Makefile.in
+++ b/gettext-tools/libgettextpo/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -115,25 +115,28 @@ host_triplet = @host@
 # Tell the mingw or Cygwin linker which symbols to export.
 @WOE32DLL_TRUE@am__append_1 = ../woe32dll/gettextpo-exports.c
 @WOE32DLL_TRUE@am__append_2 = -Wl,--export-all-symbols
-@WOE32_TRUE@am__append_3 = libgettextpo.res.lo
-@GL_COND_LIBTOOL_TRUE@am__append_4 = $(LTLIBICONV) $(LTLIBICONV)
-@LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE@am__append_5 = uniconv/u8-conv-from-enc.c
-@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE@am__append_6 = unictype/ctype_alpha.c
-@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE@am__append_7 = unictype/ctype_space.c
-@LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_TRUE@am__append_8 = unilbrk/u8-possible-linebreaks.c
-@LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_TRUE@am__append_9 = unilbrk/u8-width-linebreaks.c
-@LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_TRUE@am__append_10 = unilbrk/ulc-width-linebreaks.c
-@LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE@am__append_11 = unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@am__append_12 = unistr/u8-check.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@am__append_13 = unistr/u8-mblen.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__append_14 = unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__append_15 = unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_16 = unistr/u8-mbtoucr.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_NEXT_TRUE@am__append_17 = unistr/u8-next.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__append_18 = unistr/u8-prev.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_STRMBTOUC_TRUE@am__append_19 = unistr/u8-strmbtouc.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_20 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
-@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_21 = uniwidth/width.c
+
+# OS/2 does not support a DLL name longer than 8 characters.
+@OS2_TRUE@am__append_3 = -os2dllname gtpo
+@WOE32_TRUE@am__append_4 = libgettextpo.res.lo
+@GL_COND_LIBTOOL_TRUE@am__append_5 = $(LTLIBICONV) $(LTLIBICONV)
+@LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE@am__append_6 = uniconv/u8-conv-from-enc.c
+@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA_TRUE@am__append_7 = unictype/ctype_alpha.c
+@LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE_TRUE@am__append_8 = unictype/ctype_space.c
+@LIBUNISTRING_COMPILE_UNILBRK_U8_POSSIBLE_LINEBREAKS_TRUE@am__append_9 = unilbrk/u8-possible-linebreaks.c
+@LIBUNISTRING_COMPILE_UNILBRK_U8_WIDTH_LINEBREAKS_TRUE@am__append_10 = unilbrk/u8-width-linebreaks.c
+@LIBUNISTRING_COMPILE_UNILBRK_ULC_WIDTH_LINEBREAKS_TRUE@am__append_11 = unilbrk/ulc-width-linebreaks.c
+@LIBUNISTRING_COMPILE_UNISTR_U16_MBTOUC_TRUE@am__append_12 = unistr/u16-mbtouc.c unistr/u16-mbtouc-aux.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@am__append_13 = unistr/u8-check.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@am__append_14 = unistr/u8-mblen.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__append_15 = unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__append_16 = unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_17 = unistr/u8-mbtoucr.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_NEXT_TRUE@am__append_18 = unistr/u8-next.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__append_19 = unistr/u8-prev.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_STRMBTOUC_TRUE@am__append_20 = unistr/u8-strmbtouc.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_21 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
+@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_22 = uniwidth/width.c
 subdir = libgettextpo
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -166,6 +169,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -202,6 +206,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
@@ -494,7 +499,7 @@ am__libgnu_la_SOURCES_DIST = basename.h basename.c c-ctype.h c-ctype.c \
 	c-strstr.c concat-filename.c diffseq.h error-progname.h \
 	error-progname.c exitfail.c fd-hook.c file-ostream.c fstrcmp.h \
 	fstrcmp.c fwriteerror.h fwriteerror.c gcd.h gcd.c gettext.h \
-	hash.h hash.c gl_linked_list.h gl_linked_list.c \
+	hard-locale.c hash.h hash.c gl_linked_list.h gl_linked_list.c \
 	gl_anylinked_list1.h gl_anylinked_list2.h gl_list.h gl_list.c \
 	localcharset.h localcharset.c glthread/lock.h glthread/lock.c \
 	malloca.c markup.h markup.c mbswidth.h mbswidth.c minmax.h \
@@ -544,10 +549,10 @@ am__libgnu_la_SOURCES_DIST = basename.h basename.c c-ctype.h c-ctype.c \
 am_libgnu_la_OBJECTS = basename.lo c-ctype.lo c-strcasecmp.lo \
 	c-strncasecmp.lo c-strstr.lo concat-filename.lo \
 	error-progname.lo exitfail.lo fd-hook.lo file-ostream.lo \
-	fstrcmp.lo fwriteerror.lo gcd.lo hash.lo gl_linked_list.lo \
-	gl_list.lo localcharset.lo glthread/lock.lo malloca.lo \
-	markup.lo mbswidth.lo ostream.lo progname.lo striconv.lo \
-	striconveh.lo striconveha.lo glthread/threadlib.lo \
+	fstrcmp.lo fwriteerror.lo gcd.lo hard-locale.lo hash.lo \
+	gl_linked_list.lo gl_list.lo localcharset.lo glthread/lock.lo \
+	malloca.lo markup.lo mbswidth.lo ostream.lo progname.lo \
+	striconv.lo striconveh.lo striconveha.lo glthread/threadlib.lo \
 	glthread/tls.lo $(am__objects_3) $(am__objects_4) \
 	$(am__objects_5) unilbrk/lbrktables.lo $(am__objects_6) \
 	$(am__objects_7) unilbrk/ulc-common.lo $(am__objects_8) \
@@ -1991,7 +1996,7 @@ EXTRA_DIST = libgettextpo.rc gettext-po.in.h gnulib-m4/gnulib-cache.m4 \
 	fd-hook.h file-ostream.h file-ostream.c file_ostream.priv.h \
 	file_ostream.vt.h file-ostream.oo.c file-ostream.oo.h \
 	filename.h float.c float.in.h itold.c fopen.c fstat.c \
-	getdelim.c getline.c gettimeofday.c \
+	getdelim.c getline.c gettimeofday.c hard-locale.h \
 	$(top_srcdir)/../build-aux/config.rpath iconv.in.h \
 	iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \
 	iconv_open-osf.h iconv_open-solaris.h iconv.c iconv_close.c \
@@ -2055,7 +2060,7 @@ BUILT_SOURCES = gettext-po.h $(ALLOCA_H) configmake.h $(ERRNO_H) \
 	$(LIBUNISTRING_UNICTYPE_H) $(LIBUNISTRING_UNILBRK_H) unistd.h \
 	$(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) \
 	$(LIBUNISTRING_UNIWIDTH_H) wchar.h wctype.h
-MOSTLYCLEANFILES = core *.stackdump $(am__append_3) config.h \
+MOSTLYCLEANFILES = core *.stackdump $(am__append_4) config.h \
 	config.h-t core *.stackdump alloca.h alloca.h-t errno.h \
 	errno.h-t fcntl.h fcntl.h-t float.h float.h-t iconv.h \
 	iconv.h-t iconv_open-aix.h-t iconv_open-hpux.h-t \
@@ -2148,7 +2153,7 @@ libgettextpo_la_AUXSOURCES = \
 # Libtool's library version information for libgettextpo.
 # See the libtool documentation, section "Library interface versions".
 LTV_CURRENT = 5
-LTV_REVISION = 3
+LTV_REVISION = 4
 LTV_AGE = 5
 
 # How to build libgettextpo.la.
@@ -2157,7 +2162,8 @@ LTV_AGE = 5
 libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
 libgettextpo_la_LDFLAGS = -version-info \
 	$(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) -rpath $(libdir) \
-	@LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined $(am__append_2)
+	@LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined $(am__append_2) \
+	$(am__append_3)
 @WOE32_FALSE@WOE32_LIBADD = 
 @WOE32_TRUE@WOE32_LIBADD = libgettextpo.res.lo
 libgnu_la_SOURCES = basename.h basename.c c-ctype.h c-ctype.c \
@@ -2165,20 +2171,20 @@ libgnu_la_SOURCES = basename.h basename.c c-ctype.h c-ctype.c \
 	c-strstr.c concat-filename.c diffseq.h error-progname.h \
 	error-progname.c exitfail.c fd-hook.c file-ostream.c fstrcmp.h \
 	fstrcmp.c fwriteerror.h fwriteerror.c gcd.h gcd.c gettext.h \
-	hash.h hash.c gl_linked_list.h gl_linked_list.c \
+	hard-locale.c hash.h hash.c gl_linked_list.h gl_linked_list.c \
 	gl_anylinked_list1.h gl_anylinked_list2.h gl_list.h gl_list.c \
 	localcharset.h localcharset.c glthread/lock.h glthread/lock.c \
 	malloca.c markup.h markup.c mbswidth.h mbswidth.c minmax.h \
 	ostream.c progname.h progname.c size_max.h striconv.h \
 	striconv.c striconveh.h striconveh.c striconveha.h \
 	striconveha.c glthread/threadlib.c glthread/tls.h \
-	glthread/tls.c $(am__append_5) $(am__append_6) $(am__append_7) \
-	unilbrk/lbrktables.c $(am__append_8) $(am__append_9) \
-	unilbrk/ulc-common.c $(am__append_10) unistd.c \
-	$(am__append_11) $(am__append_12) $(am__append_13) \
-	$(am__append_14) $(am__append_15) $(am__append_16) \
-	$(am__append_17) $(am__append_18) $(am__append_19) \
-	$(am__append_20) $(am__append_21) wctype-h.c xalloc.h \
+	glthread/tls.c $(am__append_6) $(am__append_7) $(am__append_8) \
+	unilbrk/lbrktables.c $(am__append_9) $(am__append_10) \
+	unilbrk/ulc-common.c $(am__append_11) unistd.c \
+	$(am__append_12) $(am__append_13) $(am__append_14) \
+	$(am__append_15) $(am__append_16) $(am__append_17) \
+	$(am__append_18) $(am__append_19) $(am__append_20) \
+	$(am__append_21) $(am__append_22) wctype-h.c xalloc.h \
 	xmalloc.c xstrdup.c xconcat-filename.c xerror.h xerror.c \
 	gl_xlist.h gl_xlist.c xmalloca.c xsize.h xsize.c xstriconv.h \
 	xstriconv.c xvasprintf.h xvasprintf.c xasprintf.c
@@ -2194,7 +2200,7 @@ EXTRA_libgnu_la_SOURCES = close.c error.c file-ostream.oo.c float.c \
 	asnprintf.c printf-args.c printf-parse.c vasnprintf.c \
 	asprintf.c vasprintf.c wcwidth.c
 libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LTLIBICONV) \
-	$(LTLIBINTL) $(LTLIBTHREAD) $(LTLIBUNISTRING) $(am__append_4)
+	$(LTLIBINTL) $(LTLIBTHREAD) $(LTLIBUNISTRING) $(am__append_5)
 
 # Use this preprocessor expression to decide whether #include_next works.
 # Do not rely on a 'configure'-time test for this, since the expression
diff --git a/gettext-tools/libgettextpo/alignof.h b/gettext-tools/libgettextpo/alignof.h
index be53fa5..9b51af0 100644
--- a/gettext-tools/libgettextpo/alignof.h
+++ b/gettext-tools/libgettextpo/alignof.h
@@ -1,5 +1,5 @@
 /* Determine alignment of types.
-   Copyright (C) 2003-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/alloca.in.h b/gettext-tools/libgettextpo/alloca.in.h
index b334262..8603e79 100644
--- a/gettext-tools/libgettextpo/alloca.in.h
+++ b/gettext-tools/libgettextpo/alloca.in.h
@@ -1,5 +1,5 @@
 /* Memory allocation on the stack.
-   Copyright (C) 1995, 1999, 2001-2007, 2015 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2007, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/asnprintf.c b/gettext-tools/libgettextpo/asnprintf.c
index d6776ca..f23b776 100644
--- a/gettext-tools/libgettextpo/asnprintf.c
+++ b/gettext-tools/libgettextpo/asnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/asprintf.c b/gettext-tools/libgettextpo/asprintf.c
index 06ae3dd..d0ca5f2 100644
--- a/gettext-tools/libgettextpo/asprintf.c
+++ b/gettext-tools/libgettextpo/asprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/basename.c b/gettext-tools/libgettextpo/basename.c
index 56421aa..3518ade 100644
--- a/gettext-tools/libgettextpo/basename.c
+++ b/gettext-tools/libgettextpo/basename.c
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015 Free Software
+   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-tools/libgettextpo/basename.h b/gettext-tools/libgettextpo/basename.h
index 489cc67..2d7f0ad 100644
--- a/gettext-tools/libgettextpo/basename.h
+++ b/gettext-tools/libgettextpo/basename.h
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001-2003, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/c-ctype.h b/gettext-tools/libgettextpo/c-ctype.h
index 1512530..717ae78 100644
--- a/gettext-tools/libgettextpo/c-ctype.h
+++ b/gettext-tools/libgettextpo/c-ctype.h
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2016 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
diff --git a/gettext-tools/libgettextpo/c-strcase.h b/gettext-tools/libgettextpo/c-strcase.h
index f25bcca..7e570f5 100644
--- a/gettext-tools/libgettextpo/c-strcase.h
+++ b/gettext-tools/libgettextpo/c-strcase.h
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2015 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/c-strcasecmp.c b/gettext-tools/libgettextpo/c-strcasecmp.c
index 6deb6d1..bd113b7 100644
--- a/gettext-tools/libgettextpo/c-strcasecmp.c
+++ b/gettext-tools/libgettextpo/c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/c-strcaseeq.h b/gettext-tools/libgettextpo/c-strcaseeq.h
index 28dc55e..ed57251 100644
--- a/gettext-tools/libgettextpo/c-strcaseeq.h
+++ b/gettext-tools/libgettextpo/c-strcaseeq.h
@@ -1,5 +1,5 @@
 /* Optimized case-insensitive string comparison in C locale.
-   Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/c-strncasecmp.c b/gettext-tools/libgettextpo/c-strncasecmp.c
index b98e368..c316929 100644
--- a/gettext-tools/libgettextpo/c-strncasecmp.c
+++ b/gettext-tools/libgettextpo/c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/c-strstr.c b/gettext-tools/libgettextpo/c-strstr.c
index c8bebe6..eda7610 100644
--- a/gettext-tools/libgettextpo/c-strstr.c
+++ b/gettext-tools/libgettextpo/c-strstr.c
@@ -1,5 +1,5 @@
 /* c-strstr.c -- substring search in C locale
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/c-strstr.h b/gettext-tools/libgettextpo/c-strstr.h
index 4d44197..fec74a7 100644
--- a/gettext-tools/libgettextpo/c-strstr.h
+++ b/gettext-tools/libgettextpo/c-strstr.h
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2001-2003, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/close.c b/gettext-tools/libgettextpo/close.c
index 54d1f71..46a7aa5 100644
--- a/gettext-tools/libgettextpo/close.c
+++ b/gettext-tools/libgettextpo/close.c
@@ -1,5 +1,5 @@
 /* close replacement.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/libgettextpo/concat-filename.c b/gettext-tools/libgettextpo/concat-filename.c
index 1c4e77a..8fff22d 100644
--- a/gettext-tools/libgettextpo/concat-filename.c
+++ b/gettext-tools/libgettextpo/concat-filename.c
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2016 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 the
diff --git a/gettext-tools/libgettextpo/concat-filename.h b/gettext-tools/libgettextpo/concat-filename.h
index e308744..08f6b40 100644
--- a/gettext-tools/libgettextpo/concat-filename.h
+++ b/gettext-tools/libgettextpo/concat-filename.h
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2016 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
diff --git a/gettext-tools/libgettextpo/config.charset b/gettext-tools/libgettextpo/config.charset
index f06d7e9..947d916 100644
--- a/gettext-tools/libgettextpo/config.charset
+++ b/gettext-tools/libgettextpo/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2016 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
diff --git a/gettext-tools/libgettextpo/diffseq.h b/gettext-tools/libgettextpo/diffseq.h
index 2a02651..35bcd56 100644
--- a/gettext-tools/libgettextpo/diffseq.h
+++ b/gettext-tools/libgettextpo/diffseq.h
@@ -1,6 +1,6 @@
 /* Analyze differences between two vectors.
 
-   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2015 Free Software
+   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/dosname.h b/gettext-tools/libgettextpo/dosname.h
index 893baf6..83a953f 100644
--- a/gettext-tools/libgettextpo/dosname.h
+++ b/gettext-tools/libgettextpo/dosname.h
@@ -1,6 +1,6 @@
 /* File names on MS-DOS/Windows systems.
 
-   Copyright (C) 2000-2001, 2004-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2004-2006, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/errno.in.h b/gettext-tools/libgettextpo/errno.in.h
index affbb97..b8397ee 100644
--- a/gettext-tools/libgettextpo/errno.in.h
+++ b/gettext-tools/libgettextpo/errno.in.h
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/libgettextpo/error-progname.c b/gettext-tools/libgettextpo/error-progname.c
index 525d11f..ba2702a 100644
--- a/gettext-tools/libgettextpo/error-progname.c
+++ b/gettext-tools/libgettextpo/error-progname.c
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/error-progname.h b/gettext-tools/libgettextpo/error-progname.h
index f16107a..5b89b71 100644
--- a/gettext-tools/libgettextpo/error-progname.h
+++ b/gettext-tools/libgettextpo/error-progname.h
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/error.c b/gettext-tools/libgettextpo/error.c
index 0ac7695..56ac889 100644
--- a/gettext-tools/libgettextpo/error.c
+++ b/gettext-tools/libgettextpo/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/error.h b/gettext-tools/libgettextpo/error.h
index c5b3736..a9c19cb 100644
--- a/gettext-tools/libgettextpo/error.h
+++ b/gettext-tools/libgettextpo/error.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2015 Free Software Foundation,
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2016 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/libgettextpo/exitfail.c b/gettext-tools/libgettextpo/exitfail.c
index 8035b89..8033c22 100644
--- a/gettext-tools/libgettextpo/exitfail.c
+++ b/gettext-tools/libgettextpo/exitfail.c
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/exitfail.h b/gettext-tools/libgettextpo/exitfail.h
index 5f09786..ef1e488 100644
--- a/gettext-tools/libgettextpo/exitfail.h
+++ b/gettext-tools/libgettextpo/exitfail.h
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/exported.sh.in b/gettext-tools/libgettextpo/exported.sh.in
index 4d5a3a4..69374e5 100644
--- a/gettext-tools/libgettextpo/exported.sh.in
+++ b/gettext-tools/libgettextpo/exported.sh.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2015-2016 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
diff --git a/gettext-tools/libgettextpo/fcntl.in.h b/gettext-tools/libgettextpo/fcntl.in.h
index e288018..b943973 100644
--- a/gettext-tools/libgettextpo/fcntl.in.h
+++ b/gettext-tools/libgettextpo/fcntl.in.h
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-tools/libgettextpo/fd-hook.c b/gettext-tools/libgettextpo/fd-hook.c
index b1488c4..8676c6b 100644
--- a/gettext-tools/libgettextpo/fd-hook.c
+++ b/gettext-tools/libgettextpo/fd-hook.c
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/fd-hook.h b/gettext-tools/libgettextpo/fd-hook.h
index bdb9aef..9568d07 100644
--- a/gettext-tools/libgettextpo/fd-hook.h
+++ b/gettext-tools/libgettextpo/fd-hook.h
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/libgettextpo/file-ostream.c b/gettext-tools/libgettextpo/file-ostream.c
index b299429..73498cb 100644
--- a/gettext-tools/libgettextpo/file-ostream.c
+++ b/gettext-tools/libgettextpo/file-ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "file-ostream.oo.c"
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/file-ostream.h b/gettext-tools/libgettextpo/file-ostream.h
index f156871..918e8c9 100644
--- a/gettext-tools/libgettextpo/file-ostream.h
+++ b/gettext-tools/libgettextpo/file-ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "file-ostream.oo.h"
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/file-ostream.oo.c b/gettext-tools/libgettextpo/file-ostream.oo.c
index a500825..0b19942 100644
--- a/gettext-tools/libgettextpo/file-ostream.oo.c
+++ b/gettext-tools/libgettextpo/file-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/file-ostream.oo.h b/gettext-tools/libgettextpo/file-ostream.oo.h
index 395cef7..8b4fd8b 100644
--- a/gettext-tools/libgettextpo/file-ostream.oo.h
+++ b/gettext-tools/libgettextpo/file-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/filename.h b/gettext-tools/libgettextpo/filename.h
index 4576993..7d2c31a 100644
--- a/gettext-tools/libgettextpo/filename.h
+++ b/gettext-tools/libgettextpo/filename.h
@@ -1,5 +1,5 @@
 /* Basic filename support macros.
-   Copyright (C) 2001-2004, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2016 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
diff --git a/gettext-tools/libgettextpo/float+.h b/gettext-tools/libgettextpo/float+.h
index e6aaa92..00fcc76 100644
--- a/gettext-tools/libgettextpo/float+.h
+++ b/gettext-tools/libgettextpo/float+.h
@@ -1,5 +1,5 @@
 /* Supplemental information about the floating-point formats.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/float.c b/gettext-tools/libgettextpo/float.c
index dac9f88..1bad2ee 100644
--- a/gettext-tools/libgettextpo/float.c
+++ b/gettext-tools/libgettextpo/float.c
@@ -1,5 +1,5 @@
 /* Auxiliary definitions for <float.h>.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/float.in.h b/gettext-tools/libgettextpo/float.in.h
index 3bb3826..0b93d90 100644
--- a/gettext-tools/libgettextpo/float.in.h
+++ b/gettext-tools/libgettextpo/float.in.h
@@ -1,6 +1,6 @@
 /* A correct <float.h>.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/libgettextpo/fopen.c b/gettext-tools/libgettextpo/fopen.c
index 139ede2..6c0c847 100644
--- a/gettext-tools/libgettextpo/fopen.c
+++ b/gettext-tools/libgettextpo/fopen.c
@@ -1,5 +1,5 @@
 /* Open a stream to a file.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/libgettextpo/fstat.c b/gettext-tools/libgettextpo/fstat.c
index 7a0521f..435c429 100644
--- a/gettext-tools/libgettextpo/fstat.c
+++ b/gettext-tools/libgettextpo/fstat.c
@@ -1,5 +1,5 @@
 /* fstat() replacement.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/libgettextpo/fstrcmp.c b/gettext-tools/libgettextpo/fstrcmp.c
index d40e6ef..a12f2b5 100644
--- a/gettext-tools/libgettextpo/fstrcmp.c
+++ b/gettext-tools/libgettextpo/fstrcmp.c
@@ -1,5 +1,5 @@
 /* Functions to make fuzzy comparisons between strings
-   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2015 Free
+   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2016 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/fstrcmp.h b/gettext-tools/libgettextpo/fstrcmp.h
index b2a240f..0a6daeb 100644
--- a/gettext-tools/libgettextpo/fstrcmp.h
+++ b/gettext-tools/libgettextpo/fstrcmp.h
@@ -1,5 +1,5 @@
 /* Fuzzy string comparison.
-   Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2015 Free Software
+   Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <pmiller@agso.gov.au>
diff --git a/gettext-tools/libgettextpo/fwriteerror.c b/gettext-tools/libgettextpo/fwriteerror.c
index 8e7c3ea..3581975 100644
--- a/gettext-tools/libgettextpo/fwriteerror.c
+++ b/gettext-tools/libgettextpo/fwriteerror.c
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/fwriteerror.h b/gettext-tools/libgettextpo/fwriteerror.h
index 438f453..af548da 100644
--- a/gettext-tools/libgettextpo/fwriteerror.h
+++ b/gettext-tools/libgettextpo/fwriteerror.h
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/gcd.c b/gettext-tools/libgettextpo/gcd.c
index 414005e..effaeb1 100644
--- a/gettext-tools/libgettextpo/gcd.c
+++ b/gettext-tools/libgettextpo/gcd.c
@@ -1,5 +1,5 @@
 /* Arithmetic.
-   Copyright (C) 2001-2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/gcd.h b/gettext-tools/libgettextpo/gcd.h
index 56ce191..4368d98 100644
--- a/gettext-tools/libgettextpo/gcd.h
+++ b/gettext-tools/libgettextpo/gcd.h
@@ -1,5 +1,5 @@
 /* Arithmetic.
-   Copyright (C) 2001-2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/getdelim.c b/gettext-tools/libgettextpo/getdelim.c
index 88258e5..e316c91 100644
--- a/gettext-tools/libgettextpo/getdelim.c
+++ b/gettext-tools/libgettextpo/getdelim.c
@@ -1,5 +1,5 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2015 Free Software
+   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
diff --git a/gettext-tools/libgettextpo/getline.c b/gettext-tools/libgettextpo/getline.c
index 811c773..dfc679a 100644
--- a/gettext-tools/libgettextpo/getline.c
+++ b/gettext-tools/libgettextpo/getline.c
@@ -1,5 +1,5 @@
 /* getline.c --- Implementation of replacement getline function.
-   Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/gettext-po.c b/gettext-tools/libgettextpo/gettext-po.c
index ddcddd1..281d286 100644
--- a/gettext-tools/libgettextpo/gettext-po.c
+++ b/gettext-tools/libgettextpo/gettext-po.c
@@ -1,5 +1,5 @@
 /* Public API for GNU gettext PO files.
-   Copyright (C) 2003-2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/gettext-po.in.h b/gettext-tools/libgettextpo/gettext-po.in.h
index 62898d5..a42ae22 100644
--- a/gettext-tools/libgettextpo/gettext-po.in.h
+++ b/gettext-tools/libgettextpo/gettext-po.in.h
@@ -1,5 +1,5 @@
 /* Public API for GNU gettext PO files - contained in libgettextpo.
-   Copyright (C) 2003-2008, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2008, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@ extern "C" {
 /* =========================== Meta Information ============================ */
 
 /* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBGETTEXTPO_VERSION 0x001307
+#define LIBGETTEXTPO_VERSION 0x001308
 extern int libgettextpo_version;
 
 /* ================================= Types ================================= */
diff --git a/gettext-tools/libgettextpo/gettext.h b/gettext-tools/libgettextpo/gettext.h
index f37d586..841b072 100644
--- a/gettext-tools/libgettextpo/gettext.h
+++ b/gettext-tools/libgettextpo/gettext.h
@@ -1,6 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 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
@@ -225,15 +225,17 @@ dcpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcgettext (domain, msg_ctxt_id, category);
+      found_translation = (translation != msg_ctxt_id);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (translation != msg_ctxt_id)
+      if (found_translation)
         return translation;
     }
   return msgid;
@@ -271,15 +273,17 @@ dcnpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+      found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (!(translation == msg_ctxt_id || translation == msgid_plural))
+      if (found_translation)
         return translation;
     }
   return (n == 1 ? msgid : msgid_plural);
diff --git a/gettext-tools/libgettextpo/gettimeofday.c b/gettext-tools/libgettextpo/gettimeofday.c
index e0e2e69..224ca6a 100644
--- a/gettext-tools/libgettextpo/gettimeofday.c
+++ b/gettext-tools/libgettextpo/gettimeofday.c
@@ -1,6 +1,6 @@
 /* Provide gettimeofday for systems that don't have it or for which it's broken.
 
-   Copyright (C) 2001-2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/gl_anylinked_list1.h b/gettext-tools/libgettextpo/gl_anylinked_list1.h
index aa336e3..dcb66ec 100644
--- a/gettext-tools/libgettextpo/gl_anylinked_list1.h
+++ b/gettext-tools/libgettextpo/gl_anylinked_list1.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a linked list.
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/gl_anylinked_list2.h b/gettext-tools/libgettextpo/gl_anylinked_list2.h
index 5ba2806..6250c2b 100644
--- a/gettext-tools/libgettextpo/gl_anylinked_list2.h
+++ b/gettext-tools/libgettextpo/gl_anylinked_list2.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a linked list.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/gl_linked_list.c b/gettext-tools/libgettextpo/gl_linked_list.c
index b83e164..459880f 100644
--- a/gettext-tools/libgettextpo/gl_linked_list.c
+++ b/gettext-tools/libgettextpo/gl_linked_list.c
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a linked list.
-   Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/gl_linked_list.h b/gettext-tools/libgettextpo/gl_linked_list.h
index a7b7eec..4b16c83 100644
--- a/gettext-tools/libgettextpo/gl_linked_list.h
+++ b/gettext-tools/libgettextpo/gl_linked_list.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by a linked list.
-   Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/gl_list.h b/gettext-tools/libgettextpo/gl_list.h
index a0c7d27..c9d05b0 100644
--- a/gettext-tools/libgettextpo/gl_list.h
+++ b/gettext-tools/libgettextpo/gl_list.h
@@ -1,5 +1,5 @@
 /* Abstract sequential list data type.  -*- coding: utf-8 -*-
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/gl_xlist.h b/gettext-tools/libgettextpo/gl_xlist.h
index 7ea62c1..06824fc 100644
--- a/gettext-tools/libgettextpo/gl_xlist.h
+++ b/gettext-tools/libgettextpo/gl_xlist.h
@@ -1,5 +1,5 @@
 /* Abstract sequential list data type, with out-of-memory checking.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/glthread/lock.c b/gettext-tools/libgettextpo/glthread/lock.c
index b64132a..935043b 100644
--- a/gettext-tools/libgettextpo/glthread/lock.c
+++ b/gettext-tools/libgettextpo/glthread/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/libgettextpo/glthread/lock.h b/gettext-tools/libgettextpo/glthread/lock.h
index cf3d0d9..e64506b 100644
--- a/gettext-tools/libgettextpo/glthread/lock.h
+++ b/gettext-tools/libgettextpo/glthread/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/libgettextpo/glthread/threadlib.c b/gettext-tools/libgettextpo/glthread/threadlib.c
index f01d351..be63713 100644
--- a/gettext-tools/libgettextpo/glthread/threadlib.c
+++ b/gettext-tools/libgettextpo/glthread/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/libgettextpo/glthread/tls.c b/gettext-tools/libgettextpo/glthread/tls.c
index f1c0cd7..7c1916a 100644
--- a/gettext-tools/libgettextpo/glthread/tls.c
+++ b/gettext-tools/libgettextpo/glthread/tls.c
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/libgettextpo/glthread/tls.h b/gettext-tools/libgettextpo/glthread/tls.h
index cf53a2b..63955a2 100644
--- a/gettext-tools/libgettextpo/glthread/tls.h
+++ b/gettext-tools/libgettextpo/glthread/tls.h
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2016 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
diff --git a/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4 b/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4
index df20907..c4c50e3 100644
--- a/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4
+++ b/gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4 b/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4
index 2638835..061075b 100644
--- a/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4
+++ b/gettext-tools/libgettextpo/gnulib-m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -77,6 +77,7 @@ AC_DEFUN([gtpo_EARLY],
   # Code from module gettext-h:
   # Code from module gettimeofday:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module hash:
   # Code from module havelib:
   # Code from module iconv:
@@ -270,6 +271,7 @@ AC_DEFUN([gtpo_INIT],
     gl_PREREQ_GETTIMEOFDAY
   fi
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+  gl_HARD_LOCALE
   AM_ICONV
   m4_ifdef([gl_ICONV_MODULE_INDICATOR],
     [gl_ICONV_MODULE_INDICATOR([iconv])])
@@ -317,11 +319,11 @@ AC_DEFUN([gtpo_INIT],
   gl_STRING_MODULE_INDICATOR([memchr])
   gl_MINMAX
   gl_MOO
-  gl_MSVC_INVAL
+  AC_REQUIRE([gl_MSVC_INVAL])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-inval])
   fi
-  gl_MSVC_NOTHROW
+  AC_REQUIRE([gl_MSVC_NOTHROW])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-nothrow])
   fi
@@ -704,6 +706,8 @@ AC_DEFUN([gtpo_FILE_LIST], [
   lib/glthread/threadlib.c
   lib/glthread/tls.c
   lib/glthread/tls.h
+  lib/hard-locale.c
+  lib/hard-locale.h
   lib/hash.c
   lib/hash.h
   lib/iconv.c
@@ -877,6 +881,7 @@ AC_DEFUN([gtpo_FILE_LIST], [
   m4/gettimeofday.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
+  m4/hard-locale.m4
   m4/iconv.m4
   m4/iconv_h.m4
   m4/iconv_open.m4
diff --git a/gettext-tools/libgettextpo/hard-locale.c b/gettext-tools/libgettextpo/hard-locale.c
new file mode 100644
index 0000000..c7d9da5
--- /dev/null
+++ b/gettext-tools/libgettextpo/hard-locale.c
@@ -0,0 +1,72 @@
+/* hard-locale.c -- Determine whether a locale is hard.
+
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2016 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "hard-locale.h"
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __GLIBC__
+# define GLIBC_VERSION __GLIBC__
+#elif defined __UCLIBC__
+# define GLIBC_VERSION 2
+#else
+# define GLIBC_VERSION 0
+#endif
+
+/* Return true if the current CATEGORY locale is hard, i.e. if you
+   can't get away with assuming traditional C or POSIX behavior.  */
+bool
+hard_locale (int category)
+{
+  bool hard = true;
+  char const *p = setlocale (category, NULL);
+
+  if (p)
+    {
+      if (2 <= GLIBC_VERSION)
+        {
+          if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
+            hard = false;
+        }
+      else
+        {
+          char *locale = strdup (p);
+          if (locale)
+            {
+              /* Temporarily set the locale to the "C" and "POSIX" locales
+                 to find their names, so that we can determine whether one
+                 or the other is the caller's locale.  */
+              if (((p = setlocale (category, "C"))
+                   && strcmp (p, locale) == 0)
+                  || ((p = setlocale (category, "POSIX"))
+                      && strcmp (p, locale) == 0))
+                hard = false;
+
+              /* Restore the caller's locale.  */
+              setlocale (category, locale);
+              free (locale);
+            }
+        }
+    }
+
+  return hard;
+}
diff --git a/gettext-tools/libgettextpo/hard-locale.h b/gettext-tools/libgettextpo/hard-locale.h
new file mode 100644
index 0000000..7644afa
--- /dev/null
+++ b/gettext-tools/libgettextpo/hard-locale.h
@@ -0,0 +1,25 @@
+/* Determine whether a locale is hard.
+
+   Copyright (C) 1999, 2003-2004, 2009-2016 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef HARD_LOCALE_H_
+# define HARD_LOCALE_H_ 1
+
+# include <stdbool.h>
+
+bool hard_locale (int);
+
+#endif /* HARD_LOCALE_H_ */
diff --git a/gettext-tools/libgettextpo/hash.c b/gettext-tools/libgettextpo/hash.c
index 89fa5ec..4202f79 100644
--- a/gettext-tools/libgettextpo/hash.c
+++ b/gettext-tools/libgettextpo/hash.c
@@ -1,6 +1,5 @@
 /* hash - implement simple hashing table with string based keys.
-   Copyright (C) 1994-1995, 2000-2006, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1994-1995, 2000-2006, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, October 1994.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/hash.h b/gettext-tools/libgettextpo/hash.h
index b98e340..61c0397 100644
--- a/gettext-tools/libgettextpo/hash.h
+++ b/gettext-tools/libgettextpo/hash.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015 Free Software
+/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015-2016 Free Software
  * Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/iconv.c b/gettext-tools/libgettextpo/iconv.c
index 28c13c5..9ce9c01 100644
--- a/gettext-tools/libgettextpo/iconv.c
+++ b/gettext-tools/libgettextpo/iconv.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/iconv.in.h b/gettext-tools/libgettextpo/iconv.in.h
index 94ab806..cb1da14 100644
--- a/gettext-tools/libgettextpo/iconv.in.h
+++ b/gettext-tools/libgettextpo/iconv.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/libgettextpo/iconv_close.c b/gettext-tools/libgettextpo/iconv_close.c
index 59e0aca..d1cd793 100644
--- a/gettext-tools/libgettextpo/iconv_close.c
+++ b/gettext-tools/libgettextpo/iconv_close.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/iconv_open.c b/gettext-tools/libgettextpo/iconv_open.c
index 09d042d..d5c5a52 100644
--- a/gettext-tools/libgettextpo/iconv_open.c
+++ b/gettext-tools/libgettextpo/iconv_open.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/iconveh.h b/gettext-tools/libgettextpo/iconveh.h
index 118e29c..1849c39 100644
--- a/gettext-tools/libgettextpo/iconveh.h
+++ b/gettext-tools/libgettextpo/iconveh.h
@@ -1,5 +1,5 @@
 /* Character set conversion handler type.
-   Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/intprops.h b/gettext-tools/libgettextpo/intprops.h
index ecafaf7..3152139 100644
--- a/gettext-tools/libgettextpo/intprops.h
+++ b/gettext-tools/libgettextpo/intprops.h
@@ -1,10 +1,10 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2016 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
-   the Free Software Foundation; either version 3 of the License, or
+   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 the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -21,6 +21,7 @@
 #define _GL_INTPROPS_H
 
 #include <limits.h>
+#include <verify.h>
 
 /* Return a value with the common real type of E and V and the value of V.  */
 #define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
@@ -36,17 +37,6 @@
    an integer.  */
 #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
 
-/* True if negative values of the signed integer type T use two's
-   complement, ones' complement, or signed magnitude representation,
-   respectively.  Much GNU code assumes two's complement, but some
-   people like to be portable to all possible C hosts.  */
-#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
-/* True if the signed integer expression E uses two's complement.  */
-#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1)
-
 /* True if the real type T is signed.  */
 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
@@ -55,18 +45,10 @@
 #define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
 
 
-/* Minimum and maximum values for integer types and expressions.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
+/* Minimum and maximum values for integer types and expressions.  */
 
 /* The maximum and minimum values for the integer type T.  */
-#define TYPE_MINIMUM(t)                                                 \
-  ((t) (! TYPE_SIGNED (t)                                               \
-        ? (t) 0                                                         \
-        : TYPE_SIGNED_MAGNITUDE (t)                                     \
-        ? ~ (t) 0                                                       \
-        : ~ TYPE_MAXIMUM (t)))
+#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
 #define TYPE_MAXIMUM(t)                                                 \
   ((t) (! TYPE_SIGNED (t)                                               \
         ? (t) -1                                                        \
@@ -76,7 +58,7 @@
    after integer promotion.  E should not have side effects.  */
 #define _GL_INT_MINIMUM(e)                                              \
   (EXPR_SIGNED (e)                                                      \
-   ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e)         \
+   ? ~ _GL_SIGNED_INT_MAXIMUM (e)                                       \
    : _GL_INT_CONVERT (e, 0))
 #define _GL_INT_MAXIMUM(e)                                              \
   (EXPR_SIGNED (e)                                                      \
@@ -85,8 +67,25 @@
 #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
   (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
 
+/* This include file assumes that signed types are two's complement without
+   padding bits; the above macros have undefined behavior otherwise.
+   If this is a problem for you, please let us know how to fix it for your host.
+   As a sanity check, test the assumption for some signed types that
+   <limits.h> bounds.  */
+verify (TYPE_MINIMUM (signed char) == SCHAR_MIN);
+verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX);
+verify (TYPE_MINIMUM (short int) == SHRT_MIN);
+verify (TYPE_MAXIMUM (short int) == SHRT_MAX);
+verify (TYPE_MINIMUM (int) == INT_MIN);
+verify (TYPE_MAXIMUM (int) == INT_MAX);
+verify (TYPE_MINIMUM (long int) == LONG_MIN);
+verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+#ifdef LLONG_MAX
+verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+#endif
 
-/* Return 1 if the __typeof__ keyword works.  This could be done by
+/* Does the __typeof__ keyword work?  This could be done by
    'configure', but for now it's easier to do it by hand.  */
 #if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
      || (0x5110 <= __SUNPRO_C && !__STDC__))
diff --git a/gettext-tools/libgettextpo/itold.c b/gettext-tools/libgettextpo/itold.c
index 1eee03e..5533392 100644
--- a/gettext-tools/libgettextpo/itold.c
+++ b/gettext-tools/libgettextpo/itold.c
@@ -1,5 +1,5 @@
 /* Replacement for 'int' to 'long double' conversion routine.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/libgettextpo.rc b/gettext-tools/libgettextpo/libgettextpo.rc
index e12d6da..83ff2a1 100644
--- a/gettext-tools/libgettextpo/libgettextpo.rc
+++ b/gettext-tools/libgettextpo/libgettextpo.rc
@@ -24,7 +24,7 @@ BEGIN
             VALUE "FileDescription", "GPLed libgettextpo for Windows NT/2000/XP/Vista/7 and Windows 95/98/ME\0"
             VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
             VALUE "InternalName", "gettextpo.dll\0"
-            VALUE "LegalCopyright", "Copyright (C) 1995-2010\0"
+            VALUE "LegalCopyright", "Copyright (C) 1995-2016\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "gettextpo.dll\0"
             VALUE "ProductName", "libgettextpo: public API for PO files\0"
diff --git a/gettext-tools/libgettextpo/localcharset.c b/gettext-tools/libgettextpo/localcharset.c
index 1f02aa5..b2a0369 100644
--- a/gettext-tools/libgettextpo/localcharset.c
+++ b/gettext-tools/libgettextpo/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2016 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
diff --git a/gettext-tools/libgettextpo/localcharset.h b/gettext-tools/libgettextpo/localcharset.h
index c5e6d46..915182e 100644
--- a/gettext-tools/libgettextpo/localcharset.h
+++ b/gettext-tools/libgettextpo/localcharset.h
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2016 Free Software Foundation, Inc.
    This file is part of the GNU CHARSET Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/malloc.c b/gettext-tools/libgettextpo/malloc.c
index 00800a2..e9b01d2 100644
--- a/gettext-tools/libgettextpo/malloc.c
+++ b/gettext-tools/libgettextpo/malloc.c
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/malloca.c b/gettext-tools/libgettextpo/malloca.c
index 198a96c..a613277 100644
--- a/gettext-tools/libgettextpo/malloca.c
+++ b/gettext-tools/libgettextpo/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/malloca.h b/gettext-tools/libgettextpo/malloca.h
index 7a4190c..fa27a9e 100644
--- a/gettext-tools/libgettextpo/malloca.h
+++ b/gettext-tools/libgettextpo/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/markup.c b/gettext-tools/libgettextpo/markup.c
index 74ba906..fc1cca3 100644
--- a/gettext-tools/libgettextpo/markup.c
+++ b/gettext-tools/libgettextpo/markup.c
@@ -1,5 +1,5 @@
 /* markup.c -- simple XML-like parser
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file is not part of the GNU gettext program, but is used with
    GNU gettext.
diff --git a/gettext-tools/libgettextpo/markup.h b/gettext-tools/libgettextpo/markup.h
index 61e5b0e..c8b60a1 100644
--- a/gettext-tools/libgettextpo/markup.h
+++ b/gettext-tools/libgettextpo/markup.h
@@ -1,5 +1,5 @@
 /* markup.h -- simple XML-like string parser
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file is not part of the GNU gettext program, but is used with
    GNU gettext.
diff --git a/gettext-tools/libgettextpo/mbrtowc.c b/gettext-tools/libgettextpo/mbrtowc.c
index e49d55b..cdd874b 100644
--- a/gettext-tools/libgettextpo/mbrtowc.c
+++ b/gettext-tools/libgettextpo/mbrtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,11 @@
 /* Specification.  */
 #include <wchar.h>
 
+#if C_LOCALE_MAYBE_EILSEQ
+# include "hard-locale.h"
+# include <locale.h>
+#endif
+
 #if GNULIB_defined_mbstate_t
 /* Implement mbrtowc() on top of mbtowc().  */
 
@@ -328,6 +333,9 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 size_t
 rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
+  size_t ret;
+  wchar_t wc;
+
 # if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
   if (s == NULL)
     {
@@ -342,6 +350,9 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
     return (size_t) -2;
 # endif
 
+  if (! pwc)
+    pwc = &wc;
+
 # if MBRTOWC_RETVAL_BUG
   {
     static mbstate_t internal_state;
@@ -357,8 +368,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
         size_t count = 0;
         for (; n > 0; s++, n--)
           {
-            wchar_t wc;
-            size_t ret = mbrtowc (&wc, s, 1, ps);
+            ret = mbrtowc (&wc, s, 1, ps);
 
             if (ret == (size_t)(-1))
               return (size_t)(-1);
@@ -366,8 +376,7 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
             if (ret != (size_t)(-2))
               {
                 /* The multibyte character has been completed.  */
-                if (pwc != NULL)
-                  *pwc = wc;
+                *pwc = wc;
                 return (wc == 0 ? 0 : count);
               }
           }
@@ -376,32 +385,23 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
   }
 # endif
 
-# if MBRTOWC_NUL_RETVAL_BUG
-  {
-    wchar_t wc;
-    size_t ret = mbrtowc (&wc, s, n, ps);
+  ret = mbrtowc (pwc, s, n, ps);
 
-    if (ret != (size_t)(-1) && ret != (size_t)(-2))
-      {
-        if (pwc != NULL)
-          *pwc = wc;
-        if (wc == 0)
-          ret = 0;
-      }
-    return ret;
-  }
-# else
-  {
-#   if MBRTOWC_NULL_ARG1_BUG
-    wchar_t dummy;
-
-    if (pwc == NULL)
-      pwc = &dummy;
-#   endif
+# if MBRTOWC_NUL_RETVAL_BUG
+  if (ret < (size_t) -2 && !*pwc)
+    return 0;
+# endif
 
-    return mbrtowc (pwc, s, n, ps);
-  }
+# if C_LOCALE_MAYBE_EILSEQ
+  if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
+    {
+      unsigned char uc = *s;
+      *pwc = uc;
+      return 1;
+    }
 # endif
+
+  return ret;
 }
 
 #endif
diff --git a/gettext-tools/libgettextpo/mbsinit.c b/gettext-tools/libgettextpo/mbsinit.c
index 4effdd8..372b523 100644
--- a/gettext-tools/libgettextpo/mbsinit.c
+++ b/gettext-tools/libgettextpo/mbsinit.c
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/mbswidth.c b/gettext-tools/libgettextpo/mbswidth.c
index 75ca79a..a235bf1 100644
--- a/gettext-tools/libgettextpo/mbswidth.c
+++ b/gettext-tools/libgettextpo/mbswidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 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
diff --git a/gettext-tools/libgettextpo/mbswidth.h b/gettext-tools/libgettextpo/mbswidth.h
index f5b0fc3..b04cfe4 100644
--- a/gettext-tools/libgettextpo/mbswidth.h
+++ b/gettext-tools/libgettextpo/mbswidth.h
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2004, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2004, 2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/memchr.c b/gettext-tools/libgettextpo/memchr.c
index f74cc9a..b565542 100644
--- a/gettext-tools/libgettextpo/memchr.c
+++ b/gettext-tools/libgettextpo/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2015
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/gettext-tools/libgettextpo/minmax.h b/gettext-tools/libgettextpo/minmax.h
index 919678d..be6b321 100644
--- a/gettext-tools/libgettextpo/minmax.h
+++ b/gettext-tools/libgettextpo/minmax.h
@@ -1,5 +1,5 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2015 Free Software
+   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/moo.h b/gettext-tools/libgettextpo/moo.h
index 2925b58..d9e6328 100644
--- a/gettext-tools/libgettextpo/moo.h
+++ b/gettext-tools/libgettextpo/moo.h
@@ -1,5 +1,5 @@
 /* Minimal object-oriented facilities for C.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/msvc-inval.c b/gettext-tools/libgettextpo/msvc-inval.c
index a1f1dc0..baaf39e 100644
--- a/gettext-tools/libgettextpo/msvc-inval.c
+++ b/gettext-tools/libgettextpo/msvc-inval.c
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/libgettextpo/msvc-inval.h b/gettext-tools/libgettextpo/msvc-inval.h
index 8b07269..027c949 100644
--- a/gettext-tools/libgettextpo/msvc-inval.h
+++ b/gettext-tools/libgettextpo/msvc-inval.h
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/libgettextpo/msvc-nothrow.c b/gettext-tools/libgettextpo/msvc-nothrow.c
index 90cf801..ba75bbf 100644
--- a/gettext-tools/libgettextpo/msvc-nothrow.c
+++ b/gettext-tools/libgettextpo/msvc-nothrow.c
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/libgettextpo/msvc-nothrow.h b/gettext-tools/libgettextpo/msvc-nothrow.h
index 67b151e..3493b84 100644
--- a/gettext-tools/libgettextpo/msvc-nothrow.h
+++ b/gettext-tools/libgettextpo/msvc-nothrow.h
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/libgettextpo/obstack.c b/gettext-tools/libgettextpo/obstack.c
index dd6e1f7..24b67a5 100644
--- a/gettext-tools/libgettextpo/obstack.c
+++ b/gettext-tools/libgettextpo/obstack.c
@@ -1,5 +1,5 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988-2015 Free Software Foundation, Inc.
+   Copyright (C) 1988-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gettext-tools/libgettextpo/obstack.h b/gettext-tools/libgettextpo/obstack.h
index f7e791b..1c25fbc 100644
--- a/gettext-tools/libgettextpo/obstack.h
+++ b/gettext-tools/libgettextpo/obstack.h
@@ -1,5 +1,5 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988-2015 Free Software Foundation, Inc.
+   Copyright (C) 1988-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gettext-tools/libgettextpo/open.c b/gettext-tools/libgettextpo/open.c
index 95c7811..e9c3120 100644
--- a/gettext-tools/libgettextpo/open.c
+++ b/gettext-tools/libgettextpo/open.c
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/libgettextpo/ostream.c b/gettext-tools/libgettextpo/ostream.c
index 0cce0d2..380ef20 100644
--- a/gettext-tools/libgettextpo/ostream.c
+++ b/gettext-tools/libgettextpo/ostream.c
@@ -2,7 +2,7 @@
 
 #line 1 "ostream.oo.c"
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/ostream.h b/gettext-tools/libgettextpo/ostream.h
index 7fc6979..488b1de 100644
--- a/gettext-tools/libgettextpo/ostream.h
+++ b/gettext-tools/libgettextpo/ostream.h
@@ -2,7 +2,7 @@
 
 #line 1 "ostream.oo.h"
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/ostream.oo.c b/gettext-tools/libgettextpo/ostream.oo.c
index 3c178fa..443b03c 100644
--- a/gettext-tools/libgettextpo/ostream.oo.c
+++ b/gettext-tools/libgettextpo/ostream.oo.c
@@ -1,5 +1,5 @@
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/ostream.oo.h b/gettext-tools/libgettextpo/ostream.oo.h
index 87199df..d0882b9 100644
--- a/gettext-tools/libgettextpo/ostream.oo.h
+++ b/gettext-tools/libgettextpo/ostream.oo.h
@@ -1,5 +1,5 @@
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/pathmax.h b/gettext-tools/libgettextpo/pathmax.h
index 2f3b64f..aee22f8 100644
--- a/gettext-tools/libgettextpo/pathmax.h
+++ b/gettext-tools/libgettextpo/pathmax.h
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2015 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/printf-args.c b/gettext-tools/libgettextpo/printf-args.c
index da17efb..cfaed99 100644
--- a/gettext-tools/libgettextpo/printf-args.c
+++ b/gettext-tools/libgettextpo/printf-args.c
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/printf-args.h b/gettext-tools/libgettextpo/printf-args.h
index 387976c..256c413 100644
--- a/gettext-tools/libgettextpo/printf-args.h
+++ b/gettext-tools/libgettextpo/printf-args.h
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/printf-parse.c b/gettext-tools/libgettextpo/printf-parse.c
index 40d0a22..fad5d3d 100644
--- a/gettext-tools/libgettextpo/printf-parse.c
+++ b/gettext-tools/libgettextpo/printf-parse.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2016 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
diff --git a/gettext-tools/libgettextpo/printf-parse.h b/gettext-tools/libgettextpo/printf-parse.h
index fda6704..a46d946 100644
--- a/gettext-tools/libgettextpo/printf-parse.h
+++ b/gettext-tools/libgettextpo/printf-parse.h
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2015 Free Software
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2016 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/progname.c b/gettext-tools/libgettextpo/progname.c
index fe93bca..debb760 100644
--- a/gettext-tools/libgettextpo/progname.c
+++ b/gettext-tools/libgettextpo/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/progname.h b/gettext-tools/libgettextpo/progname.h
index 15ca3a2..526828f 100644
--- a/gettext-tools/libgettextpo/progname.h
+++ b/gettext-tools/libgettextpo/progname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/raise.c b/gettext-tools/libgettextpo/raise.c
index d6ba2a1..bf24c3e 100644
--- a/gettext-tools/libgettextpo/raise.c
+++ b/gettext-tools/libgettextpo/raise.c
@@ -1,6 +1,6 @@
 /* Provide a non-threads replacement for the POSIX raise function.
 
-   Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2006, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/rawmemchr.c b/gettext-tools/libgettextpo/rawmemchr.c
index a6380ba..dbe01bd 100644
--- a/gettext-tools/libgettextpo/rawmemchr.c
+++ b/gettext-tools/libgettextpo/rawmemchr.c
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/libgettextpo/realloc.c b/gettext-tools/libgettextpo/realloc.c
index 068b081..83cb44e 100644
--- a/gettext-tools/libgettextpo/realloc.c
+++ b/gettext-tools/libgettextpo/realloc.c
@@ -1,6 +1,6 @@
 /* realloc() function that is glibc compatible.
 
-   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2015 Free Software
+   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/ref-add.sin b/gettext-tools/libgettextpo/ref-add.sin
index 6cbe5b5..42d3ab0 100644
--- a/gettext-tools/libgettextpo/ref-add.sin
+++ b/gettext-tools/libgettextpo/ref-add.sin
@@ -1,6 +1,6 @@
 # Add this package to a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/ref-del.sin b/gettext-tools/libgettextpo/ref-del.sin
index f50cf0a..c77b33b 100644
--- a/gettext-tools/libgettextpo/ref-del.sin
+++ b/gettext-tools/libgettextpo/ref-del.sin
@@ -1,6 +1,6 @@
 # Remove this package from a list of references stored in a text file.
 #
-#   Copyright (C) 2000, 2009-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/relocatable.c b/gettext-tools/libgettextpo/relocatable.c
index bed882d..7a59595 100644
--- a/gettext-tools/libgettextpo/relocatable.c
+++ b/gettext-tools/libgettextpo/relocatable.c
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/relocatable.h b/gettext-tools/libgettextpo/relocatable.h
index c8911b2..4081f22 100644
--- a/gettext-tools/libgettextpo/relocatable.h
+++ b/gettext-tools/libgettextpo/relocatable.h
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003, 2005, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/signal.in.h b/gettext-tools/libgettextpo/signal.in.h
index 265b72a..ab0a049 100644
--- a/gettext-tools/libgettextpo/signal.in.h
+++ b/gettext-tools/libgettextpo/signal.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <signal.h>.
 
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-tools/libgettextpo/sigprocmask.c b/gettext-tools/libgettextpo/sigprocmask.c
index e29b012..fcbf032 100644
--- a/gettext-tools/libgettextpo/sigprocmask.c
+++ b/gettext-tools/libgettextpo/sigprocmask.c
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/size_max.h b/gettext-tools/libgettextpo/size_max.h
index 5a0568e..2f2792c 100644
--- a/gettext-tools/libgettextpo/size_max.h
+++ b/gettext-tools/libgettextpo/size_max.h
@@ -1,5 +1,5 @@
 /* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/stat.c b/gettext-tools/libgettextpo/stat.c
index 2209826..62e9e0b 100644
--- a/gettext-tools/libgettextpo/stat.c
+++ b/gettext-tools/libgettextpo/stat.c
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/libgettextpo/stdarg.in.h b/gettext-tools/libgettextpo/stdarg.in.h
index 5239f51..63371e2 100644
--- a/gettext-tools/libgettextpo/stdarg.in.h
+++ b/gettext-tools/libgettextpo/stdarg.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <stdarg.h>.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 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
diff --git a/gettext-tools/libgettextpo/stdbool.in.h b/gettext-tools/libgettextpo/stdbool.in.h
index 64a1761..7ecf203 100644
--- a/gettext-tools/libgettextpo/stdbool.in.h
+++ b/gettext-tools/libgettextpo/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/stddef.in.h b/gettext-tools/libgettextpo/stddef.in.h
index 698307b..f4c4a10 100644
--- a/gettext-tools/libgettextpo/stddef.in.h
+++ b/gettext-tools/libgettextpo/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
@@ -81,8 +81,10 @@
 # define wchar_t int
 #endif
 
-/* Some platforms lack max_align_t.  */
-#if !@HAVE_MAX_ALIGN_T@
+/* Some platforms lack max_align_t.  The check for _GCC_MAX_ALIGN_T is
+   a hack in case the configure-time test was done with g++ even though
+   we are currently compiling with gcc.  */
+#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)
 /* On the x86, the maximum storage alignment of double, long, etc. is 4,
    but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
    and the C11 standard allows this.  Work around this problem by
diff --git a/gettext-tools/libgettextpo/stdint.in.h b/gettext-tools/libgettextpo/stdint.in.h
index 378de2e..cf65ec6 100644
--- a/gettext-tools/libgettextpo/stdint.in.h
+++ b/gettext-tools/libgettextpo/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2016 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -118,15 +118,10 @@
    picky compilers.  */
 
 #define _STDINT_MIN(signed, bits, zero) \
-  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
+  ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero))
 
 #define _STDINT_MAX(signed, bits, zero) \
-  ((signed) \
-   ? ~ _STDINT_MIN (signed, bits, zero) \
-   : /* The expression for the unsigned case.  The subtraction of (signed) \
-        is a nop in the unsigned case and avoids "signed integer overflow" \
-        warnings in the signed case.  */ \
-     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+  (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
 
 #if !GNULIB_defined_stdint_types
 
@@ -288,12 +283,17 @@ typedef gl_uint_fast32_t gl_uint_fast16_t;
 
 /* 7.18.1.4. Integer types capable of holding object pointers */
 
+/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own
+   definitions of intptr_t and uintptr_t (which use int and unsigned)
+   to avoid clashes with declarations of system functions like sbrk.  */
+#ifndef _INTPTR_T_DECLARED
 #undef intptr_t
 #undef uintptr_t
 typedef long int gl_intptr_t;
 typedef unsigned long int gl_uintptr_t;
 #define intptr_t gl_intptr_t
 #define uintptr_t gl_uintptr_t
+#endif
 
 /* 7.18.1.5. Greatest-width integer types */
 
diff --git a/gettext-tools/libgettextpo/stdio-write.c b/gettext-tools/libgettextpo/stdio-write.c
index b913101..072e55b 100644
--- a/gettext-tools/libgettextpo/stdio-write.c
+++ b/gettext-tools/libgettextpo/stdio-write.c
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream write function.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/stdio.in.h b/gettext-tools/libgettextpo/stdio.in.h
index ec43874..9b31365 100644
--- a/gettext-tools/libgettextpo/stdio.in.h
+++ b/gettext-tools/libgettextpo/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2016 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
diff --git a/gettext-tools/libgettextpo/stdlib.in.h b/gettext-tools/libgettextpo/stdlib.in.h
index 428a119..70dc88d 100644
--- a/gettext-tools/libgettextpo/stdlib.in.h
+++ b/gettext-tools/libgettextpo/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2016 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
diff --git a/gettext-tools/libgettextpo/stpcpy.c b/gettext-tools/libgettextpo/stpcpy.c
index 559d2f2..ec3996e 100644
--- a/gettext-tools/libgettextpo/stpcpy.c
+++ b/gettext-tools/libgettextpo/stpcpy.c
@@ -1,5 +1,5 @@
 /* stpcpy.c -- copy a string and return pointer to end of new string
-   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2015 Free Software
+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-tools/libgettextpo/stpncpy.c b/gettext-tools/libgettextpo/stpncpy.c
index e72ea47..89d6321 100644
--- a/gettext-tools/libgettextpo/stpncpy.c
+++ b/gettext-tools/libgettextpo/stpncpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2015 Free Software
+/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2016 Free Software
  * Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gettext-tools/libgettextpo/str-two-way.h b/gettext-tools/libgettextpo/str-two-way.h
index 6e10c8e..0fe3161 100644
--- a/gettext-tools/libgettextpo/str-two-way.h
+++ b/gettext-tools/libgettextpo/str-two-way.h
@@ -1,5 +1,5 @@
 /* Byte-wise substring search, using the Two-Way algorithm.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
diff --git a/gettext-tools/libgettextpo/strchrnul.c b/gettext-tools/libgettextpo/strchrnul.c
index 1000e83..1482a77 100644
--- a/gettext-tools/libgettextpo/strchrnul.c
+++ b/gettext-tools/libgettextpo/strchrnul.c
@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007-2016 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
diff --git a/gettext-tools/libgettextpo/streq.h b/gettext-tools/libgettextpo/streq.h
index 6107fc6..234f075 100644
--- a/gettext-tools/libgettextpo/streq.h
+++ b/gettext-tools/libgettextpo/streq.h
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/strerror-override.c b/gettext-tools/libgettextpo/strerror-override.c
index 2bb4d74..9bc9b18 100644
--- a/gettext-tools/libgettextpo/strerror-override.c
+++ b/gettext-tools/libgettextpo/strerror-override.c
@@ -1,6 +1,6 @@
 /* strerror-override.c --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/libgettextpo/strerror-override.h b/gettext-tools/libgettextpo/strerror-override.h
index 7af36df..5264fd5 100644
--- a/gettext-tools/libgettextpo/strerror-override.h
+++ b/gettext-tools/libgettextpo/strerror-override.h
@@ -1,6 +1,6 @@
 /* strerror-override.h --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2010-2016 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
diff --git a/gettext-tools/libgettextpo/strerror.c b/gettext-tools/libgettextpo/strerror.c
index adba738..45c7633 100644
--- a/gettext-tools/libgettextpo/strerror.c
+++ b/gettext-tools/libgettextpo/strerror.c
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/libgettextpo/striconv.c b/gettext-tools/libgettextpo/striconv.c
index 6f7dad8..0d9ccdc 100644
--- a/gettext-tools/libgettextpo/striconv.c
+++ b/gettext-tools/libgettextpo/striconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2010-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/striconv.h b/gettext-tools/libgettextpo/striconv.h
index 33cc212..e5217d7 100644
--- a/gettext-tools/libgettextpo/striconv.h
+++ b/gettext-tools/libgettextpo/striconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/striconveh.c b/gettext-tools/libgettextpo/striconveh.c
index 2a9a8f7..bc5608f 100644
--- a/gettext-tools/libgettextpo/striconveh.c
+++ b/gettext-tools/libgettextpo/striconveh.c
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling.
-   Copyright (C) 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/striconveh.h b/gettext-tools/libgettextpo/striconveh.h
index 1e13af6..9e05d2f 100644
--- a/gettext-tools/libgettextpo/striconveh.h
+++ b/gettext-tools/libgettextpo/striconveh.h
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling.
-   Copyright (C) 2001-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/striconveha.c b/gettext-tools/libgettextpo/striconveha.c
index 4fadc17..d97de1b 100644
--- a/gettext-tools/libgettextpo/striconveha.c
+++ b/gettext-tools/libgettextpo/striconveha.c
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/striconveha.h b/gettext-tools/libgettextpo/striconveha.h
index a5b8824..73d1c9a 100644
--- a/gettext-tools/libgettextpo/striconveha.h
+++ b/gettext-tools/libgettextpo/striconveha.h
@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/string.in.h b/gettext-tools/libgettextpo/string.in.h
index 2abd6bc..7fb00c1 100644
--- a/gettext-tools/libgettextpo/string.in.h
+++ b/gettext-tools/libgettextpo/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2016 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
diff --git a/gettext-tools/libgettextpo/strstr.c b/gettext-tools/libgettextpo/strstr.c
index fbc11a2..60cd3e3 100644
--- a/gettext-tools/libgettextpo/strstr.c
+++ b/gettext-tools/libgettextpo/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2015 Free Software
+/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gettext-tools/libgettextpo/sys_stat.in.h b/gettext-tools/libgettextpo/sys_stat.in.h
index 9f5e853..72d9537 100644
--- a/gettext-tools/libgettextpo/sys_stat.in.h
+++ b/gettext-tools/libgettextpo/sys_stat.in.h
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/libgettextpo/sys_time.in.h b/gettext-tools/libgettextpo/sys_time.in.h
index c556c5d..1623a1d 100644
--- a/gettext-tools/libgettextpo/sys_time.in.h
+++ b/gettext-tools/libgettextpo/sys_time.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/time.h.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/libgettextpo/sys_types.in.h b/gettext-tools/libgettextpo/sys_types.in.h
index 814bc17..8ab0545 100644
--- a/gettext-tools/libgettextpo/sys_types.in.h
+++ b/gettext-tools/libgettextpo/sys_types.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/types.h.
 
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 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
diff --git a/gettext-tools/libgettextpo/time.in.h b/gettext-tools/libgettextpo/time.in.h
index a90552c..865c114 100644
--- a/gettext-tools/libgettextpo/time.in.h
+++ b/gettext-tools/libgettextpo/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/libgettextpo/uniconv.in.h b/gettext-tools/libgettextpo/uniconv.in.h
index bca94ba..7c3b0c3 100644
--- a/gettext-tools/libgettextpo/uniconv.in.h
+++ b/gettext-tools/libgettextpo/uniconv.in.h
@@ -1,5 +1,5 @@
 /* Conversions between Unicode and legacy encodings.
-   Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c b/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c
index 3fdc8ca..a75001d 100644
--- a/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c
+++ b/gettext-tools/libgettextpo/uniconv/u8-conv-from-enc.c
@@ -1,5 +1,5 @@
 /* Conversion to UTF-8 from legacy encodings.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/unictype.in.h b/gettext-tools/libgettextpo/unictype.in.h
index fdbfdd3..72b5f96 100644
--- a/gettext-tools/libgettextpo/unictype.in.h
+++ b/gettext-tools/libgettextpo/unictype.in.h
@@ -1,5 +1,5 @@
 /* Unicode character classification and properties.
-   Copyright (C) 2002, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2016 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
diff --git a/gettext-tools/libgettextpo/unictype/bitmap.h b/gettext-tools/libgettextpo/unictype/bitmap.h
index 19aea60..fa2f60e 100644
--- a/gettext-tools/libgettextpo/unictype/bitmap.h
+++ b/gettext-tools/libgettextpo/unictype/bitmap.h
@@ -1,5 +1,5 @@
 /* Three-level bitmap lookup.
-   Copyright (C) 2000-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2000-2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unictype/ctype_alpha.c b/gettext-tools/libgettextpo/unictype/ctype_alpha.c
index d122fb0..aeb2f0f 100644
--- a/gettext-tools/libgettextpo/unictype/ctype_alpha.c
+++ b/gettext-tools/libgettextpo/unictype/ctype_alpha.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unictype/ctype_space.c b/gettext-tools/libgettextpo/unictype/ctype_space.c
index 7bca2ac..81b349a 100644
--- a/gettext-tools/libgettextpo/unictype/ctype_space.c
+++ b/gettext-tools/libgettextpo/unictype/ctype_space.c
@@ -1,5 +1,5 @@
 /* ISO C <ctype.h> like properties of Unicode characters.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unilbrk.in.h b/gettext-tools/libgettextpo/unilbrk.in.h
index 0ff4556..da83e02 100644
--- a/gettext-tools/libgettextpo/unilbrk.in.h
+++ b/gettext-tools/libgettextpo/unilbrk.in.h
@@ -1,5 +1,5 @@
 /* Line breaking of Unicode strings.
-   Copyright (C) 2001-2003, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unilbrk/lbrktables.c b/gettext-tools/libgettextpo/unilbrk/lbrktables.c
index 81a77b4..44ca9ce 100644
--- a/gettext-tools/libgettextpo/unilbrk/lbrktables.c
+++ b/gettext-tools/libgettextpo/unilbrk/lbrktables.c
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary tables.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unilbrk/lbrktables.h b/gettext-tools/libgettextpo/unilbrk/lbrktables.h
index 42599ae..08fb533 100644
--- a/gettext-tools/libgettextpo/unilbrk/lbrktables.h
+++ b/gettext-tools/libgettextpo/unilbrk/lbrktables.h
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary tables.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c b/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c
index e848a02..0e8ea6b 100644
--- a/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c
+++ b/gettext-tools/libgettextpo/unilbrk/u8-possible-linebreaks.c
@@ -1,5 +1,5 @@
 /* Line breaking of UTF-8 strings.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c b/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c
index 1d95956..346fc52 100644
--- a/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c
+++ b/gettext-tools/libgettextpo/unilbrk/u8-width-linebreaks.c
@@ -1,5 +1,5 @@
 /* Line breaking of UTF-8 strings.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unilbrk/ulc-common.c b/gettext-tools/libgettextpo/unilbrk/ulc-common.c
index 9fd2624..68704b3 100644
--- a/gettext-tools/libgettextpo/unilbrk/ulc-common.c
+++ b/gettext-tools/libgettextpo/unilbrk/ulc-common.c
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary functions.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unilbrk/ulc-common.h b/gettext-tools/libgettextpo/unilbrk/ulc-common.h
index 661270d..2a98ba2 100644
--- a/gettext-tools/libgettextpo/unilbrk/ulc-common.h
+++ b/gettext-tools/libgettextpo/unilbrk/ulc-common.h
@@ -1,5 +1,5 @@
 /* Line breaking auxiliary functions.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c b/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c
index 96f416e..4b1119d 100644
--- a/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c
+++ b/gettext-tools/libgettextpo/unilbrk/ulc-width-linebreaks.c
@@ -1,5 +1,5 @@
 /* Line breaking of strings.
-   Copyright (C) 2001-2003, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistd.in.h b/gettext-tools/libgettextpo/unistd.in.h
index 93f1ed9..a9ac097 100644
--- a/gettext-tools/libgettextpo/unistd.in.h
+++ b/gettext-tools/libgettextpo/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 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
diff --git a/gettext-tools/libgettextpo/unistr.in.h b/gettext-tools/libgettextpo/unistr.in.h
index be158be..70aa9cb 100644
--- a/gettext-tools/libgettextpo/unistr.in.h
+++ b/gettext-tools/libgettextpo/unistr.in.h
@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2016 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
diff --git a/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c b/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c
index 2e8487d..5e88e04 100644
--- a/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c
+++ b/gettext-tools/libgettextpo/unistr/u16-mbtouc-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UTF-16 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u16-mbtouc.c b/gettext-tools/libgettextpo/unistr/u16-mbtouc.c
index 75a2521..00c1025 100644
--- a/gettext-tools/libgettextpo/unistr/u16-mbtouc.c
+++ b/gettext-tools/libgettextpo/unistr/u16-mbtouc.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-16 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-check.c b/gettext-tools/libgettextpo/unistr/u8-check.c
index 9c4a75c..786ebb5 100644
--- a/gettext-tools/libgettextpo/unistr/u8-check.c
+++ b/gettext-tools/libgettextpo/unistr/u8-check.c
@@ -1,5 +1,5 @@
 /* Check UTF-8 string.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-mblen.c b/gettext-tools/libgettextpo/unistr/u8-mblen.c
index 32d960c..88b4cef 100644
--- a/gettext-tools/libgettextpo/unistr/u8-mblen.c
+++ b/gettext-tools/libgettextpo/unistr/u8-mblen.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2015 Free Software
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c b/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c
index a751844..ca3c3ab 100644
--- a/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c
+++ b/gettext-tools/libgettextpo/unistr/u8-mbtouc-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c b/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c
index ae46311..2073d18 100644
--- a/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c
+++ b/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c b/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c
index e27dd69..04ed687 100644
--- a/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c
+++ b/gettext-tools/libgettextpo/unistr/u8-mbtouc-unsafe.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtouc.c b/gettext-tools/libgettextpo/unistr/u8-mbtouc.c
index 2e9aced..edae650 100644
--- a/gettext-tools/libgettextpo/unistr/u8-mbtouc.c
+++ b/gettext-tools/libgettextpo/unistr/u8-mbtouc.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c b/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c
index 9cc1500..48f9ca3 100644
--- a/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c
+++ b/gettext-tools/libgettextpo/unistr/u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string, returning an error code.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-next.c b/gettext-tools/libgettextpo/unistr/u8-next.c
index a1492b0..2e30476 100644
--- a/gettext-tools/libgettextpo/unistr/u8-next.c
+++ b/gettext-tools/libgettextpo/unistr/u8-next.c
@@ -1,5 +1,5 @@
 /* Iterate over next character in UTF-8 string.
-   Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-prev.c b/gettext-tools/libgettextpo/unistr/u8-prev.c
index 20c8844..2fa94c9 100644
--- a/gettext-tools/libgettextpo/unistr/u8-prev.c
+++ b/gettext-tools/libgettextpo/unistr/u8-prev.c
@@ -1,5 +1,5 @@
 /* Iterate over previous character in UTF-8 string.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-strmbtouc.c b/gettext-tools/libgettextpo/unistr/u8-strmbtouc.c
index a67a202..03e06b1 100644
--- a/gettext-tools/libgettextpo/unistr/u8-strmbtouc.c
+++ b/gettext-tools/libgettextpo/unistr/u8-strmbtouc.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2015 Free Software
+   Copyright (C) 1999-2000, 2002, 2006-2007, 2009-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
diff --git a/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c b/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c
index 65445be..d5ff1d6 100644
--- a/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c
+++ b/gettext-tools/libgettextpo/unistr/u8-uctomb-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unistr/u8-uctomb.c b/gettext-tools/libgettextpo/unistr/u8-uctomb.c
index a8250f4..419a6b4 100644
--- a/gettext-tools/libgettextpo/unistr/u8-uctomb.c
+++ b/gettext-tools/libgettextpo/unistr/u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unitypes.in.h b/gettext-tools/libgettextpo/unitypes.in.h
index d3c47ae..c6ca0ba 100644
--- a/gettext-tools/libgettextpo/unitypes.in.h
+++ b/gettext-tools/libgettextpo/unitypes.in.h
@@ -1,5 +1,5 @@
 /* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/uniwidth.in.h b/gettext-tools/libgettextpo/uniwidth.in.h
index 7694beb..0ab6d25 100644
--- a/gettext-tools/libgettextpo/uniwidth.in.h
+++ b/gettext-tools/libgettextpo/uniwidth.in.h
@@ -1,5 +1,5 @@
 /* Display width functions.
-   Copyright (C) 2001-2002, 2005, 2007, 2009-2015 Free Software Foundation,
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/uniwidth/cjk.h b/gettext-tools/libgettextpo/uniwidth/cjk.h
index cdd9a55..0eac6fe 100644
--- a/gettext-tools/libgettextpo/uniwidth/cjk.h
+++ b/gettext-tools/libgettextpo/uniwidth/cjk.h
@@ -1,5 +1,5 @@
 /* Test for CJK encoding.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/uniwidth/width.c b/gettext-tools/libgettextpo/uniwidth/width.c
index c7e03b2..bd3b3fc 100644
--- a/gettext-tools/libgettextpo/uniwidth/width.c
+++ b/gettext-tools/libgettextpo/uniwidth/width.c
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gettext-tools/libgettextpo/unlocked-io.h b/gettext-tools/libgettextpo/unlocked-io.h
index 06ffac6..c0ece50 100644
--- a/gettext-tools/libgettextpo/unlocked-io.h
+++ b/gettext-tools/libgettextpo/unlocked-io.h
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/vasnprintf.c b/gettext-tools/libgettextpo/vasnprintf.c
index 88332f0..72bf3bc 100644
--- a/gettext-tools/libgettextpo/vasnprintf.c
+++ b/gettext-tools/libgettextpo/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2016 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
diff --git a/gettext-tools/libgettextpo/vasnprintf.h b/gettext-tools/libgettextpo/vasnprintf.h
index 3494eef..8e9d84f 100644
--- a/gettext-tools/libgettextpo/vasnprintf.h
+++ b/gettext-tools/libgettextpo/vasnprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2007-2016 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
diff --git a/gettext-tools/libgettextpo/vasprintf.c b/gettext-tools/libgettextpo/vasprintf.c
index 5dd4abd..a5dc1be 100644
--- a/gettext-tools/libgettextpo/vasprintf.c
+++ b/gettext-tools/libgettextpo/vasprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2016 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
diff --git a/gettext-tools/libgettextpo/verify.h b/gettext-tools/libgettextpo/verify.h
index 60eba49..2f43837 100644
--- a/gettext-tools/libgettextpo/verify.h
+++ b/gettext-tools/libgettextpo/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2016 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
diff --git a/gettext-tools/libgettextpo/wchar.in.h b/gettext-tools/libgettextpo/wchar.in.h
index 684299f..755600f 100644
--- a/gettext-tools/libgettextpo/wchar.in.h
+++ b/gettext-tools/libgettextpo/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
@@ -31,7 +31,7 @@
 @PRAGMA_COLUMNS@
 
 #if (((defined __need_mbstate_t || defined __need_wint_t)               \
-      && !defined __MINGW32__)                                          \
+      && !defined __MINGW32__ && !defined __KLIBC__)                    \
      || (defined __hpux                                                 \
          && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
              || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H))               \
@@ -445,6 +445,11 @@ _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
 #  if !@HAVE_DECL_WCWIDTH@
 /* wcwidth exists but is not declared.  */
 _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+#  elif defined __KLIBC__
+/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a
+   static inline function.  The implementation of wcwidth in wcwidth.c
+   causes a "conflicting types" error. */
+#   undef wcwidth
 #  endif
 _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
 # endif
diff --git a/gettext-tools/libgettextpo/wctype.in.h b/gettext-tools/libgettextpo/wctype.in.h
index 9050b7e..3431854 100644
--- a/gettext-tools/libgettextpo/wctype.in.h
+++ b/gettext-tools/libgettextpo/wctype.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2016 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
diff --git a/gettext-tools/libgettextpo/wcwidth.c b/gettext-tools/libgettextpo/wcwidth.c
index d2b7118..b94fad0 100644
--- a/gettext-tools/libgettextpo/wcwidth.c
+++ b/gettext-tools/libgettextpo/wcwidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a character.
-   Copyright (C) 2006-2007, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010-2016 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
diff --git a/gettext-tools/libgettextpo/xalloc.h b/gettext-tools/libgettextpo/xalloc.h
index b261994..f4a329e 100644
--- a/gettext-tools/libgettextpo/xalloc.h
+++ b/gettext-tools/libgettextpo/xalloc.h
@@ -1,5 +1,5 @@
 /* malloc with out of memory checking.
-   Copyright (C) 2001-2004, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/xasprintf.c b/gettext-tools/libgettextpo/xasprintf.c
index f8eef97..e9e83ef 100644
--- a/gettext-tools/libgettextpo/xasprintf.c
+++ b/gettext-tools/libgettextpo/xasprintf.c
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006, 2009-2015 Free Software Foundation,
+   Copyright (C) 1999, 2002-2004, 2006, 2009-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/xconcat-filename.c b/gettext-tools/libgettextpo/xconcat-filename.c
index 10ebbea..7e4593e 100644
--- a/gettext-tools/libgettextpo/xconcat-filename.c
+++ b/gettext-tools/libgettextpo/xconcat-filename.c
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2016 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 the
diff --git a/gettext-tools/libgettextpo/xerror.c b/gettext-tools/libgettextpo/xerror.c
index 705b553..3c1e799 100644
--- a/gettext-tools/libgettextpo/xerror.c
+++ b/gettext-tools/libgettextpo/xerror.c
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/xerror.h b/gettext-tools/libgettextpo/xerror.h
index fc8b163..d702c3a 100644
--- a/gettext-tools/libgettextpo/xerror.h
+++ b/gettext-tools/libgettextpo/xerror.h
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/xmalloc.c b/gettext-tools/libgettextpo/xmalloc.c
index 43dcb94..9d435a5 100644
--- a/gettext-tools/libgettextpo/xmalloc.c
+++ b/gettext-tools/libgettextpo/xmalloc.c
@@ -1,6 +1,6 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015-2016 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
diff --git a/gettext-tools/libgettextpo/xmalloca.c b/gettext-tools/libgettextpo/xmalloca.c
index 4fc7c8a..bcbed77 100644
--- a/gettext-tools/libgettextpo/xmalloca.c
+++ b/gettext-tools/libgettextpo/xmalloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation with out of memory checking.
-   Copyright (C) 2003, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/xmalloca.h b/gettext-tools/libgettextpo/xmalloca.h
index c067c8a..f90fa9f 100644
--- a/gettext-tools/libgettextpo/xmalloca.h
+++ b/gettext-tools/libgettextpo/xmalloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation with out of memory checking.
-   Copyright (C) 2003, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/xsize.h b/gettext-tools/libgettextpo/xsize.h
index b2a786a..202a87e 100644
--- a/gettext-tools/libgettextpo/xsize.h
+++ b/gettext-tools/libgettextpo/xsize.h
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008-2016 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
diff --git a/gettext-tools/libgettextpo/xstrdup.c b/gettext-tools/libgettextpo/xstrdup.c
index 7aa09dc..c7fbe14 100644
--- a/gettext-tools/libgettextpo/xstrdup.c
+++ b/gettext-tools/libgettextpo/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015 Free Software
+   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/xstriconv.c b/gettext-tools/libgettextpo/xstriconv.c
index d5e1951..2dbee18 100644
--- a/gettext-tools/libgettextpo/xstriconv.c
+++ b/gettext-tools/libgettextpo/xstriconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/xstriconv.h b/gettext-tools/libgettextpo/xstriconv.h
index 6319989..61e7c75 100644
--- a/gettext-tools/libgettextpo/xstriconv.h
+++ b/gettext-tools/libgettextpo/xstriconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion with out-of-memory checking.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgettextpo/xvasprintf.c b/gettext-tools/libgettextpo/xvasprintf.c
index 441ab59..9deaad0 100644
--- a/gettext-tools/libgettextpo/xvasprintf.c
+++ b/gettext-tools/libgettextpo/xvasprintf.c
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 1999, 2002-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2004, 2006-2016 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
diff --git a/gettext-tools/libgettextpo/xvasprintf.h b/gettext-tools/libgettextpo/xvasprintf.h
index 3b7f5ad..d62d7b7 100644
--- a/gettext-tools/libgettextpo/xvasprintf.h
+++ b/gettext-tools/libgettextpo/xvasprintf.h
@@ -1,5 +1,5 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 2002-2004, 2006-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2006-2016 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
diff --git a/gettext-tools/libgrep/Makefile.am b/gettext-tools/libgrep/Makefile.am
index 14ba3a3..67cf999 100644
--- a/gettext-tools/libgrep/Makefile.am
+++ b/gettext-tools/libgrep/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for libgrep directory in GNU gettext package.
-## Copyright (C) 2005-2007, 2009-2010, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 2005-2007, 2009-2010, 2015-2016 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
diff --git a/gettext-tools/libgrep/Makefile.gnulib b/gettext-tools/libgrep/Makefile.gnulib
index 15254b6..a3b1c33 100644
--- a/gettext-tools/libgrep/Makefile.gnulib
+++ b/gettext-tools/libgrep/Makefile.gnulib
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gettext-tools/libgrep/Makefile.in b/gettext-tools/libgrep/Makefile.in
index 3937499..38d4fbc 100644
--- a/gettext-tools/libgrep/Makefile.in
+++ b/gettext-tools/libgrep/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -142,6 +142,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -178,6 +179,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-tools/libgrep/btowc.c b/gettext-tools/libgrep/btowc.c
index 2e32dee..e7badf9 100644
--- a/gettext-tools/libgrep/btowc.c
+++ b/gettext-tools/libgrep/btowc.c
@@ -1,5 +1,5 @@
 /* Convert unibyte character to wide character.
-   Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgrep/glthread/lock.c b/gettext-tools/libgrep/glthread/lock.c
index b64132a..935043b 100644
--- a/gettext-tools/libgrep/glthread/lock.c
+++ b/gettext-tools/libgrep/glthread/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/libgrep/glthread/lock.h b/gettext-tools/libgrep/glthread/lock.h
index cf3d0d9..e64506b 100644
--- a/gettext-tools/libgrep/glthread/lock.h
+++ b/gettext-tools/libgrep/glthread/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/libgrep/glthread/threadlib.c b/gettext-tools/libgrep/glthread/threadlib.c
index f01d351..be63713 100644
--- a/gettext-tools/libgrep/glthread/threadlib.c
+++ b/gettext-tools/libgrep/glthread/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2016 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
diff --git a/gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4 b/gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4
index 73670df..ffa682b 100644
--- a/gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4
+++ b/gettext-tools/libgrep/gnulib-m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gettext-tools/libgrep/gnulib-m4/gnulib-comp.m4 b/gettext-tools/libgrep/gnulib-m4/gnulib-comp.m4
index 13bc360..b0c8a2e 100644
--- a/gettext-tools/libgrep/gnulib-m4/gnulib-comp.m4
+++ b/gettext-tools/libgrep/gnulib-m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gettext-tools/libgrep/gnulib-m4/localeconv.m4 b/gettext-tools/libgrep/gnulib-m4/localeconv.m4
index 464e630..6e1dbf1 100644
--- a/gettext-tools/libgrep/gnulib-m4/localeconv.m4
+++ b/gettext-tools/libgrep/gnulib-m4/localeconv.m4
@@ -1,5 +1,5 @@
 # localeconv.m4 serial 1
-dnl Copyright (C) 2012-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/libgrep/gnulib-m4/mbrlen.m4 b/gettext-tools/libgrep/gnulib-m4/mbrlen.m4
index 68d7b91..5baf8e3 100644
--- a/gettext-tools/libgrep/gnulib-m4/mbrlen.m4
+++ b/gettext-tools/libgrep/gnulib-m4/mbrlen.m4
@@ -1,5 +1,5 @@
 # mbrlen.m4 serial 9  -*- coding: utf-8 -*-
-dnl Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/libgrep/gnulib-m4/nl_langinfo.m4 b/gettext-tools/libgrep/gnulib-m4/nl_langinfo.m4
index c8bf20f..a2f7196 100644
--- a/gettext-tools/libgrep/gnulib-m4/nl_langinfo.m4
+++ b/gettext-tools/libgrep/gnulib-m4/nl_langinfo.m4
@@ -1,5 +1,5 @@
 # nl_langinfo.m4 serial 5
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/libgrep/gnulib-m4/regex.m4 b/gettext-tools/libgrep/gnulib-m4/regex.m4
index 0fa7455..abfd262 100644
--- a/gettext-tools/libgrep/gnulib-m4/regex.m4
+++ b/gettext-tools/libgrep/gnulib-m4/regex.m4
@@ -1,6 +1,6 @@
-# serial 65
+# serial 66
 
-# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -93,6 +93,7 @@ AC_DEFUN([gl_REGEX],
                                       0, sizeof data - 1, &regs)
                            != -1)
                     result |= 1;
+                  regfree (&regex);
                 }
 
                 {
@@ -124,6 +125,7 @@ AC_DEFUN([gl_REGEX],
                       if (i != 0 && i != 21)
                         result |= 1;
                     }
+                  regfree (&regex);
                 }
 
                 if (! setlocale (LC_ALL, "C"))
diff --git a/gettext-tools/libgrep/kwset.c b/gettext-tools/libgrep/kwset.c
index 776b79d..ae3ff87 100644
--- a/gettext-tools/libgrep/kwset.c
+++ b/gettext-tools/libgrep/kwset.c
@@ -1,5 +1,5 @@
 /* kwset.c - search for any of a set of keywords.
-   Copyright 1989, 1998, 2000, 2005-2006, 2010, 2012, 2015 Free Software
+   Copyright 1989, 1998, 2000, 2005-2006, 2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgrep/kwset.h b/gettext-tools/libgrep/kwset.h
index 530649a..2ed1360 100644
--- a/gettext-tools/libgrep/kwset.h
+++ b/gettext-tools/libgrep/kwset.h
@@ -1,5 +1,5 @@
 /* kwset.h - header declaring the keyword set library.
-   Copyright (C) 1989, 1998, 2005, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1998, 2005, 2015-2016 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
diff --git a/gettext-tools/libgrep/langinfo.in.h b/gettext-tools/libgrep/langinfo.in.h
index 04fd535..e11617c 100644
--- a/gettext-tools/libgrep/langinfo.in.h
+++ b/gettext-tools/libgrep/langinfo.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <langinfo.h>.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 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
diff --git a/gettext-tools/libgrep/libgrep.h b/gettext-tools/libgrep/libgrep.h
index 2ab4968..a97fe73 100644
--- a/gettext-tools/libgrep/libgrep.h
+++ b/gettext-tools/libgrep/libgrep.h
@@ -1,5 +1,5 @@
 /* Search for patterns in strings or files.
-   Copyright (C) 2005, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2015-2016 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
diff --git a/gettext-tools/libgrep/localeconv.c b/gettext-tools/libgrep/localeconv.c
index 8f2d084..8a1d6d7 100644
--- a/gettext-tools/libgrep/localeconv.c
+++ b/gettext-tools/libgrep/localeconv.c
@@ -1,5 +1,5 @@
 /* Query locale dependent information for formatting numbers.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 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
diff --git a/gettext-tools/libgrep/m-fgrep.c b/gettext-tools/libgrep/m-fgrep.c
index 8225828..ce76c8c 100644
--- a/gettext-tools/libgrep/m-fgrep.c
+++ b/gettext-tools/libgrep/m-fgrep.c
@@ -1,5 +1,5 @@
 /* Pattern Matcher for Fixed String search.
-   Copyright (C) 1992, 1998, 2000, 2005-2006, 2010, 2015 Free Software
+   Copyright (C) 1992, 1998, 2000, 2005-2006, 2010, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgrep/m-regex.c b/gettext-tools/libgrep/m-regex.c
index 2f4660b..3c57d00 100644
--- a/gettext-tools/libgrep/m-regex.c
+++ b/gettext-tools/libgrep/m-regex.c
@@ -1,5 +1,5 @@
 /* Pattern Matchers for Regular Expressions.
-   Copyright (C) 1992, 1998, 2000, 2005-2006, 2010, 2015 Free Software
+   Copyright (C) 1992, 1998, 2000, 2005-2006, 2010, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgrep/mbrlen.c b/gettext-tools/libgrep/mbrlen.c
index b6334f2..3ceb156 100644
--- a/gettext-tools/libgrep/mbrlen.c
+++ b/gettext-tools/libgrep/mbrlen.c
@@ -1,5 +1,5 @@
 /* Recognize multibyte character.
-   Copyright (C) 1999-2000, 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgrep/mbtowc-impl.h b/gettext-tools/libgrep/mbtowc-impl.h
index 5c60478..4be2994 100644
--- a/gettext-tools/libgrep/mbtowc-impl.h
+++ b/gettext-tools/libgrep/mbtowc-impl.h
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgrep/mbtowc.c b/gettext-tools/libgrep/mbtowc.c
index e58053d..fb2b651 100644
--- a/gettext-tools/libgrep/mbtowc.c
+++ b/gettext-tools/libgrep/mbtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/libgrep/nl_langinfo.c b/gettext-tools/libgrep/nl_langinfo.c
index 79b0406..699511a 100644
--- a/gettext-tools/libgrep/nl_langinfo.c
+++ b/gettext-tools/libgrep/nl_langinfo.c
@@ -1,6 +1,6 @@
 /* nl_langinfo() replacement: query locale dependent information.
 
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 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
diff --git a/gettext-tools/libgrep/regcomp.c b/gettext-tools/libgrep/regcomp.c
index 01b668b..d4b4a2a 100644
--- a/gettext-tools/libgrep/regcomp.c
+++ b/gettext-tools/libgrep/regcomp.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -153,9 +153,9 @@ static const char __re_error_msgid[] =
     gettext_noop ("Invalid back reference") /* REG_ESUBREG */
     "\0"
 #define REG_EBRACK_IDX	(REG_ESUBREG_IDX + sizeof "Invalid back reference")
-    gettext_noop ("Unmatched [ or [^")	/* REG_EBRACK */
+    gettext_noop ("Unmatched [, [^, [:, [., or [=")	/* REG_EBRACK */
     "\0"
-#define REG_EPAREN_IDX	(REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
+#define REG_EPAREN_IDX	(REG_EBRACK_IDX + sizeof "Unmatched [, [^, [:, [., or [=")
     gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
     "\0"
 #define REG_EBRACE_IDX	(REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")
@@ -213,17 +213,9 @@ static const size_t __re_error_msgid_idx[] =
    Assumes the 'allocated' (and perhaps 'buffer') and 'translate' fields
    are set in BUFP on entry.  */
 
-#ifdef _LIBC
-const char *
-re_compile_pattern (pattern, length, bufp)
-    const char *pattern;
-    size_t length;
-    struct re_pattern_buffer *bufp;
-#else /* size_t might promote */
 const char *
 re_compile_pattern (const char *pattern, size_t length,
 		    struct re_pattern_buffer *bufp)
-#endif
 {
   reg_errcode_t ret;
 
@@ -261,8 +253,7 @@ reg_syntax_t re_syntax_options;
    defined in regex.h.  We return the old syntax.  */
 
 reg_syntax_t
-re_set_syntax (syntax)
-    reg_syntax_t syntax;
+re_set_syntax (reg_syntax_t syntax)
 {
   reg_syntax_t ret = re_syntax_options;
 
@@ -274,8 +265,7 @@ weak_alias (__re_set_syntax, re_set_syntax)
 #endif
 
 int
-re_compile_fastmap (bufp)
-    struct re_pattern_buffer *bufp;
+re_compile_fastmap (struct re_pattern_buffer *bufp)
 {
   re_dfa_t *dfa = bufp->buffer;
   char *fastmap = bufp->fastmap;
@@ -474,10 +464,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
    the return codes and their meanings.)  */
 
 int
-regcomp (preg, pattern, cflags)
-    regex_t *_Restrict_ preg;
-    const char *_Restrict_ pattern;
-    int cflags;
+regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
 {
   reg_errcode_t ret;
   reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
@@ -535,18 +522,9 @@ weak_alias (__regcomp, regcomp)
 /* Returns a message corresponding to an error code, ERRCODE, returned
    from either regcomp or regexec.   We don't use PREG here.  */
 
-#ifdef _LIBC
-size_t
-regerror (errcode, preg, errbuf, errbuf_size)
-    int errcode;
-    const regex_t *_Restrict_ preg;
-    char *_Restrict_ errbuf;
-    size_t errbuf_size;
-#else /* size_t might promote */
 size_t
-regerror (int errcode, const regex_t *_Restrict_ preg,
-	  char *_Restrict_ errbuf, size_t errbuf_size)
-#endif
+regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf,
+	  size_t errbuf_size)
 {
   const char *msg;
   size_t msg_size;
@@ -662,8 +640,7 @@ free_dfa_content (re_dfa_t *dfa)
 /* Free dynamically allocated space used by PREG.  */
 
 void
-regfree (preg)
-    regex_t *preg;
+regfree (regex_t *preg)
 {
   re_dfa_t *dfa = preg->buffer;
   if (BE (dfa != NULL, 1))
@@ -699,8 +676,7 @@ char *
    regcomp/regexec above without link errors.  */
 weak_function
 # endif
-re_comp (s)
-     const char *s;
+re_comp (const char *s)
 {
   reg_errcode_t ret;
   char *fastmap;
@@ -1421,7 +1397,7 @@ calc_first (void *extra, bin_tree_t *node)
     {
       node->first = node;
       node->node_idx = re_dfa_add_node (dfa, node->token);
-      if (BE (node->node_idx == REG_MISSING, 0))
+      if (BE (node->node_idx == -1, 0))
 	return REG_ESPACE;
       if (node->token.type == ANCHOR)
 	dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type;
@@ -1482,8 +1458,8 @@ link_nfa_nodes (void *extra, bin_tree_t *node)
 	  right = node->right->first->node_idx;
 	else
 	  right = node->next->node_idx;
-	assert (REG_VALID_INDEX (left));
-	assert (REG_VALID_INDEX (right));
+	assert (left > -1);
+	assert (right > -1);
 	err = re_node_set_init_2 (dfa->edests + idx, left, right);
       }
       break;
@@ -1533,7 +1509,7 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
 	  org_dest = dfa->nexts[org_node];
 	  re_node_set_empty (dfa->edests + clone_node);
 	  clone_dest = duplicate_node (dfa, org_dest, constraint);
-	  if (BE (clone_dest == REG_MISSING, 0))
+	  if (BE (clone_dest == -1, 0))
 	    return REG_ESPACE;
 	  dfa->nexts[clone_node] = dfa->nexts[org_node];
 	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
@@ -1566,7 +1542,7 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
 	  /* In case the node has another constraint, append it.  */
 	  constraint |= dfa->nodes[org_node].constraint;
 	  clone_dest = duplicate_node (dfa, org_dest, constraint);
-	  if (BE (clone_dest == REG_MISSING, 0))
+	  if (BE (clone_dest == -1, 0))
 	    return REG_ESPACE;
 	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
 	  if (BE (! ok, 0))
@@ -1580,12 +1556,12 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
 	  re_node_set_empty (dfa->edests + clone_node);
 	  /* Search for a duplicated node which satisfies the constraint.  */
 	  clone_dest = search_duplicated_node (dfa, org_dest, constraint);
-	  if (clone_dest == REG_MISSING)
+	  if (clone_dest == -1)
 	    {
 	      /* There is no such duplicated node, create a new one.  */
 	      reg_errcode_t err;
 	      clone_dest = duplicate_node (dfa, org_dest, constraint);
-	      if (BE (clone_dest == REG_MISSING, 0))
+	      if (BE (clone_dest == -1, 0))
 		return REG_ESPACE;
 	      ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
 	      if (BE (! ok, 0))
@@ -1606,7 +1582,7 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
 
 	  org_dest = dfa->edests[org_node].elems[1];
 	  clone_dest = duplicate_node (dfa, org_dest, constraint);
-	  if (BE (clone_dest == REG_MISSING, 0))
+	  if (BE (clone_dest == -1, 0))
 	    return REG_ESPACE;
 	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
 	  if (BE (! ok, 0))
@@ -1632,18 +1608,18 @@ search_duplicated_node (const re_dfa_t *dfa, Idx org_node,
 	  && constraint == dfa->nodes[idx].constraint)
 	return idx; /* Found.  */
     }
-  return REG_MISSING; /* Not found.  */
+  return -1; /* Not found.  */
 }
 
 /* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT.
-   Return the index of the new node, or REG_MISSING if insufficient storage is
+   Return the index of the new node, or -1 if insufficient storage is
    available.  */
 
 static Idx
 duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint)
 {
   Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]);
-  if (BE (dup_idx != REG_MISSING, 1))
+  if (BE (dup_idx != -1, 1))
     {
       dfa->nodes[dup_idx].constraint = constraint;
       dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].constraint;
@@ -1702,7 +1678,7 @@ calc_eclosure (re_dfa_t *dfa)
 	}
 
 #ifdef DEBUG
-      assert (dfa->eclosures[node_idx].nelem != REG_MISSING);
+      assert (dfa->eclosures[node_idx].nelem != -1);
 #endif
 
       /* If we have already calculated, skip it.  */
@@ -1738,7 +1714,7 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
 
   /* This indicates that we are calculating this node now.
      We reference this value to avoid infinite loop.  */
-  dfa->eclosures[node].nelem = REG_MISSING;
+  dfa->eclosures[node].nelem = -1;
 
   /* If the current node has constraints, duplicate all nodes
      since they must inherit the constraints.  */
@@ -1760,7 +1736,7 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
 	Idx edest = dfa->edests[node].elems[i];
 	/* If calculating the epsilon closure of 'edest' is in progress,
 	   return intermediate result.  */
-	if (dfa->eclosures[edest].nelem == REG_MISSING)
+	if (dfa->eclosures[edest].nelem == -1)
 	  {
 	    incomplete = true;
 	    continue;
@@ -2557,7 +2533,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
     {
       end = 0;
       start = fetch_number (regexp, token, syntax);
-      if (start == REG_MISSING)
+      if (start == -1)
 	{
 	  if (token->type == CHARACTER && token->opr.c == ',')
 	    start = 0; /* We treat "{,m}" as "{0,m}".  */
@@ -2567,14 +2543,14 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
 	      return NULL;
 	    }
 	}
-      if (BE (start != REG_ERROR, 1))
+      if (BE (start != -2, 1))
 	{
 	  /* We treat "{n}" as "{n,n}".  */
 	  end = ((token->type == OP_CLOSE_DUP_NUM) ? start
 		 : ((token->type == CHARACTER && token->opr.c == ',')
-		    ? fetch_number (regexp, token, syntax) : REG_ERROR));
+		    ? fetch_number (regexp, token, syntax) : -2));
 	}
-      if (BE (start == REG_ERROR || end == REG_ERROR, 0))
+      if (BE (start == -2 || end == -2, 0))
 	{
 	  /* Invalid sequence.  */
 	  if (BE (!(syntax & RE_INVALID_INTERVAL_ORD), 0))
@@ -2596,7 +2572,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
 	  return elem;
 	}
 
-      if (BE ((end != REG_MISSING && start > end)
+      if (BE ((end != -1 && start > end)
 	      || token->type != OP_CLOSE_DUP_NUM, 0))
 	{
 	  /* First number greater than second.  */
@@ -2604,7 +2580,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
 	  return NULL;
 	}
 
-      if (BE (RE_DUP_MAX < (end == REG_MISSING ? start : end), 0))
+      if (BE (RE_DUP_MAX < (end == -1 ? start : end), 0))
 	{
 	  *err = REG_ESIZE;
 	  return NULL;
@@ -2613,7 +2589,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
   else
     {
       start = (token->type == OP_DUP_PLUS) ? 1 : 0;
-      end = (token->type == OP_DUP_QUESTION) ? 1 : REG_MISSING;
+      end = (token->type == OP_DUP_QUESTION) ? 1 : -1;
     }
 
   fetch_token (token, regexp, syntax);
@@ -2657,7 +2633,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
     }
 
   tree = create_tree (dfa, elem, NULL,
-		      (end == REG_MISSING ? OP_DUP_ASTERISK : OP_ALT));
+		      (end == -1 ? OP_DUP_ASTERISK : OP_ALT));
   if (BE (tree == NULL, 0))
     goto parse_dup_op_espace;
 
@@ -2665,10 +2641,10 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
    True if the arithmetic type T is signed.  */
 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
-  /* This loop is actually executed only when end != REG_MISSING,
+  /* This loop is actually executed only when end != -1,
      to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?...  We have
      already created the start+1-th copy.  */
-  if (TYPE_SIGNED (Idx) || end != REG_MISSING)
+  if (TYPE_SIGNED (Idx) || end != -1)
     for (i = start + 2; i <= end; ++i)
       {
 	elem = duplicate_tree (elem, dfa);
@@ -2696,6 +2672,19 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
 #define BRACKET_NAME_BUF_SIZE 32
 
 #ifndef _LIBC
+
+# ifdef RE_ENABLE_I18N
+/* Convert the byte B to the corresponding wide character.  In a
+   unibyte locale, treat B as itself if it is an encoding error.
+   In a multibyte locale, return WEOF if B is an encoding error.  */
+static wint_t
+parse_byte (unsigned char b, re_charset_t *mbcset)
+{
+  wint_t wc = __btowc (b);
+  return wc == WEOF && !mbcset ? b : wc;
+}
+#endif
+
   /* Local function for parse_bracket_exp only used in case of NOT _LIBC.
      Build the range expression which starts from START_ELEM, and ends
      at END_ELEM.  The result are written to MBCSET and SBCSET.
@@ -2747,9 +2736,9 @@ build_range_exp (const reg_syntax_t syntax,
 	      : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
 		 : 0));
     start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM)
-		? __btowc (start_ch) : start_elem->opr.wch);
+		? parse_byte (start_ch, mbcset) : start_elem->opr.wch);
     end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM)
-	      ? __btowc (end_ch) : end_elem->opr.wch);
+	      ? parse_byte (end_ch, mbcset) : end_elem->opr.wch);
     if (start_wc == WEOF || end_wc == WEOF)
       return REG_ECOLLATE;
     else if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_wc > end_wc, 0))
@@ -2779,7 +2768,11 @@ build_range_exp (const reg_syntax_t syntax,
 					new_nranges);
 
 	    if (BE (new_array_start == NULL || new_array_end == NULL, 0))
-	      return REG_ESPACE;
+	      {
+		re_free (new_array_start);
+		re_free (new_array_end);
+		return REG_ESPACE;
+	      }
 
 	    mbcset->range_starts = new_array_start;
 	    mbcset->range_ends = new_array_end;
@@ -3676,26 +3669,21 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
   bin_tree_t *tree;
 
   sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
-#ifdef RE_ENABLE_I18N
-  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
-#endif /* RE_ENABLE_I18N */
-
-#ifdef RE_ENABLE_I18N
-  if (BE (sbcset == NULL || mbcset == NULL, 0))
-#else /* not RE_ENABLE_I18N */
   if (BE (sbcset == NULL, 0))
-#endif /* not RE_ENABLE_I18N */
     {
       *err = REG_ESPACE;
       return NULL;
     }
-
-  if (non_match)
-    {
 #ifdef RE_ENABLE_I18N
-      mbcset->non_match = 1;
-#endif /* not RE_ENABLE_I18N */
+  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
+  if (BE (mbcset == NULL, 0))
+    {
+      re_free (sbcset);
+      *err = REG_ESPACE;
+      return NULL;
     }
+  mbcset->non_match = non_match;
+#endif /* RE_ENABLE_I18N */
 
   /* We don't care the syntax in this case.  */
   ret = build_charclass (trans, sbcset,
@@ -3728,6 +3716,9 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
 #endif
 
   /* Build a tree for simple bracket.  */
+#ifdef lint
+  memset (&br_token, 0, sizeof br_token);
+#endif
   br_token.type = SIMPLE_BRACKET;
   br_token.opr.sbcset = sbcset;
   tree = create_token_tree (dfa, NULL, NULL, &br_token);
@@ -3770,27 +3761,26 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
 
 /* This is intended for the expressions like "a{1,3}".
    Fetch a number from 'input', and return the number.
-   Return REG_MISSING if the number field is empty like "{,1}".
+   Return -1 if the number field is empty like "{,1}".
    Return RE_DUP_MAX + 1 if the number field is too large.
-   Return REG_ERROR if an error occurred.  */
+   Return -2 if an error occurred.  */
 
 static Idx
 fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
 {
-  Idx num = REG_MISSING;
+  Idx num = -1;
   unsigned char c;
   while (1)
     {
       fetch_token (token, input, syntax);
       c = token->opr.c;
       if (BE (token->type == END_OF_RE, 0))
-	return REG_ERROR;
+	return -2;
       if (token->type == OP_CLOSE_DUP_NUM || c == ',')
 	break;
-      num = ((token->type != CHARACTER || c < '0' || '9' < c
-	      || num == REG_ERROR)
-	     ? REG_ERROR
-	     : num == REG_MISSING
+      num = ((token->type != CHARACTER || c < '0' || '9' < c || num == -2)
+	     ? -2
+	     : num == -1
 	     ? c - '0'
 	     : MIN (RE_DUP_MAX + 1, num * 10 + c - '0'));
     }
@@ -3822,6 +3812,9 @@ create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
 	     re_token_type_t type)
 {
   re_token_t t;
+#ifdef lint
+  memset (&t, 0, sizeof t);
+#endif
   t.type = type;
   return create_token_tree (dfa, left, right, &t);
 }
@@ -3851,7 +3844,7 @@ create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
   tree->token.opt_subexp = 0;
   tree->first = NULL;
   tree->next = NULL;
-  tree->node_idx = REG_MISSING;
+  tree->node_idx = -1;
 
   if (left != NULL)
     left->parent = tree;
diff --git a/gettext-tools/libgrep/regex.c b/gettext-tools/libgrep/regex.c
index 6d0ae88..432b465 100644
--- a/gettext-tools/libgrep/regex.c
+++ b/gettext-tools/libgrep/regex.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
diff --git a/gettext-tools/libgrep/regex.h b/gettext-tools/libgrep/regex.h
index f7de394..31f4e4d 100644
--- a/gettext-tools/libgrep/regex.h
+++ b/gettext-tools/libgrep/regex.h
@@ -1,6 +1,6 @@
 /* Definitions for data structures and routines for the regular
    expression library.
-   Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2015 Free Software
+   Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -42,11 +42,6 @@ extern "C" {
    supported within glibc itself, and glibc users should not define
    _REGEX_LARGE_OFFSETS.  */
 
-/* The type of nonnegative object indexes.  Traditionally, GNU regex
-   uses 'int' for these.  Code that uses __re_idx_t should work
-   regardless of whether the type is signed.  */
-typedef size_t __re_idx_t;
-
 /* The type of object sizes.  */
 typedef size_t __re_size_t;
 
@@ -58,7 +53,6 @@ typedef size_t __re_long_size_t;
 
 /* The traditional GNU regex implementation mishandles strings longer
    than INT_MAX.  */
-typedef int __re_idx_t;
 typedef unsigned int __re_size_t;
 typedef unsigned long int __re_long_size_t;
 
@@ -488,7 +482,8 @@ typedef struct re_pattern_buffer regex_t;
 #ifdef _REGEX_LARGE_OFFSETS
 /* POSIX 1003.1-2008 requires that regoff_t be at least as wide as
    ptrdiff_t and ssize_t.  We don't know of any hosts where ptrdiff_t
-   is wider than ssize_t, so ssize_t is safe.  */
+   is wider than ssize_t, so ssize_t is safe.  ptrdiff_t is not
+   visible here, so use ssize_t.  */
 typedef ssize_t regoff_t;
 #else
 /* The traditional GNU regex implementation mishandles strings longer
@@ -538,7 +533,7 @@ extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax);
    BUFFER.  Return NULL if successful, and an error string if not.
 
    To free the allocated storage, you must call 'regfree' on BUFFER.
-   Note that the translate table must either have been initialised by
+   Note that the translate table must either have been initialized by
    'regcomp', with a malloc'ed value, or set to NULL before calling
    'regfree'.  */
 extern const char *re_compile_pattern (const char *__pattern, size_t __length,
@@ -557,34 +552,34 @@ extern int re_compile_fastmap (struct re_pattern_buffer *__buffer);
    match, or -2 for an internal error.  Also return register
    information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
 extern regoff_t re_search (struct re_pattern_buffer *__buffer,
-			   const char *__string, __re_idx_t __length,
-			   __re_idx_t __start, regoff_t __range,
+			   const char *__string, regoff_t __length,
+			   regoff_t __start, regoff_t __range,
 			   struct re_registers *__regs);
 
 
 /* Like 're_search', but search in the concatenation of STRING1 and
    STRING2.  Also, stop searching at index START + STOP.  */
 extern regoff_t re_search_2 (struct re_pattern_buffer *__buffer,
-			     const char *__string1, __re_idx_t __length1,
-			     const char *__string2, __re_idx_t __length2,
-			     __re_idx_t __start, regoff_t __range,
+			     const char *__string1, regoff_t __length1,
+			     const char *__string2, regoff_t __length2,
+			     regoff_t __start, regoff_t __range,
 			     struct re_registers *__regs,
-			     __re_idx_t __stop);
+			     regoff_t __stop);
 
 
 /* Like 're_search', but return how many characters in STRING the regexp
    in BUFFER matched, starting at position START.  */
 extern regoff_t re_match (struct re_pattern_buffer *__buffer,
-			  const char *__string, __re_idx_t __length,
-			  __re_idx_t __start, struct re_registers *__regs);
+			  const char *__string, regoff_t __length,
+			  regoff_t __start, struct re_registers *__regs);
 
 
 /* Relates to 're_match' as 're_search_2' relates to 're_search'.  */
 extern regoff_t re_match_2 (struct re_pattern_buffer *__buffer,
-			    const char *__string1, __re_idx_t __length1,
-			    const char *__string2, __re_idx_t __length2,
-			    __re_idx_t __start, struct re_registers *__regs,
-			    __re_idx_t __stop);
+			    const char *__string1, regoff_t __length1,
+			    const char *__string2, regoff_t __length2,
+			    regoff_t __start, struct re_registers *__regs,
+			    regoff_t __stop);
 
 
 /* Set REGS to hold NUM_REGS registers, storing them in STARTS and
diff --git a/gettext-tools/libgrep/regex_internal.c b/gettext-tools/libgrep/regex_internal.c
index 2514344..7d02511 100644
--- a/gettext-tools/libgrep/regex_internal.c
+++ b/gettext-tools/libgrep/regex_internal.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -922,7 +922,7 @@ internal_function
 re_string_context_at (const re_string_t *input, Idx idx, int eflags)
 {
   int c;
-  if (BE (! REG_VALID_INDEX (idx), 0))
+  if (BE (idx < 0, 0))
     /* In this case, we use the value stored in input->tip_context,
        since we can't know the character in input->mbs[-1] here.  */
     return input->tip_context;
@@ -938,10 +938,10 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags)
 	{
 #if defined DEBUG && DEBUG
 	  /* It must not happen.  */
-	  assert (REG_VALID_INDEX (wc_idx));
+	  assert (wc_idx >= 0);
 #endif
 	  --wc_idx;
-	  if (! REG_VALID_INDEX (wc_idx))
+	  if (wc_idx < 0)
 	    return input->tip_context;
 	}
       wc = input->wcs[wc_idx];
@@ -1077,25 +1077,25 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
       if (src1->elems[i1] == src2->elems[i2])
 	{
 	  /* Try to find the item in DEST.  Maybe we could binary search?  */
-	  while (REG_VALID_INDEX (id) && dest->elems[id] > src1->elems[i1])
+	  while (id >= 0 && dest->elems[id] > src1->elems[i1])
 	    --id;
 
-          if (! REG_VALID_INDEX (id) || dest->elems[id] != src1->elems[i1])
+	  if (id < 0 || dest->elems[id] != src1->elems[i1])
             dest->elems[--sbase] = src1->elems[i1];
 
-	  if (! REG_VALID_INDEX (--i1) || ! REG_VALID_INDEX (--i2))
+	  if (--i1 < 0 || --i2 < 0)
 	    break;
 	}
 
       /* Lower the highest of the two items.  */
       else if (src1->elems[i1] < src2->elems[i2])
 	{
-	  if (! REG_VALID_INDEX (--i2))
+	  if (--i2 < 0)
 	    break;
 	}
       else
 	{
-	  if (! REG_VALID_INDEX (--i1))
+	  if (--i1 < 0)
 	    break;
 	}
     }
@@ -1108,7 +1108,7 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
      DEST elements are already in place; this is more or
      less the same loop that is in re_node_set_merge.  */
   dest->nelem += delta;
-  if (delta > 0 && REG_VALID_INDEX (id))
+  if (delta > 0 && id >= 0)
     for (;;)
       {
 	if (dest->elems[is] > dest->elems[id])
@@ -1122,7 +1122,7 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
 	  {
 	    /* Slide from the bottom.  */
 	    dest->elems[id + delta] = dest->elems[id];
-	    if (! REG_VALID_INDEX (--id))
+	    if (--id < 0)
 	      break;
 	  }
       }
@@ -1216,8 +1216,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
   /* Copy into the top of DEST the items of SRC that are not
      found in DEST.  Maybe we could binary search in DEST?  */
   for (sbase = dest->nelem + 2 * src->nelem,
-       is = src->nelem - 1, id = dest->nelem - 1;
-       REG_VALID_INDEX (is) && REG_VALID_INDEX (id); )
+       is = src->nelem - 1, id = dest->nelem - 1; is >= 0 && id >= 0; )
     {
       if (dest->elems[id] == src->elems[is])
 	is--, id--;
@@ -1227,7 +1226,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
 	--id;
     }
 
-  if (REG_VALID_INDEX (is))
+  if (is >= 0)
     {
       /* If DEST is exhausted, the remaining items of SRC must be unique.  */
       sbase -= is + 1;
@@ -1256,7 +1255,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
 	{
 	  /* Slide from the bottom.  */
 	  dest->elems[id + delta] = dest->elems[id];
-	  if (! REG_VALID_INDEX (--id))
+	  if (--id < 0)
 	    {
 	      /* Copy remaining SRC elements.  */
 	      memcpy (dest->elems, dest->elems + sbase,
@@ -1355,7 +1354,7 @@ re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
   Idx i;
   if (set1 == NULL || set2 == NULL || set1->nelem != set2->nelem)
     return false;
-  for (i = set1->nelem ; REG_VALID_INDEX (--i) ; )
+  for (i = set1->nelem ; --i >= 0 ; )
     if (set1->elems[i] != set2->elems[i])
       return false;
   return true;
@@ -1368,7 +1367,7 @@ internal_function __attribute__ ((pure))
 re_node_set_contains (const re_node_set *set, Idx elem)
 {
   __re_size_t idx, right, mid;
-  if (! REG_VALID_NONZERO_INDEX (set->nelem))
+  if (set->nelem <= 0)
     return 0;
 
   /* Binary search the element.  */
@@ -1398,7 +1397,7 @@ re_node_set_remove_at (re_node_set *set, Idx idx)
 
 
 /* Add the token TOKEN to dfa->nodes, and return the index of the token.
-   Or return REG_MISSING if an error occurred.  */
+   Or return -1 if an error occurred.  */
 
 static Idx
 internal_function
@@ -1416,11 +1415,11 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
 					  MAX (sizeof (re_node_set),
 					       sizeof (Idx)));
       if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_nodes_alloc, 0))
-	return REG_MISSING;
+	return -1;
 
       new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc);
       if (BE (new_nodes == NULL, 0))
-	return REG_MISSING;
+	return -1;
       dfa->nodes = new_nodes;
       new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc);
       new_indices = re_realloc (dfa->org_indices, Idx, new_nodes_alloc);
@@ -1428,7 +1427,13 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
       new_eclosures = re_realloc (dfa->eclosures, re_node_set, new_nodes_alloc);
       if (BE (new_nexts == NULL || new_indices == NULL
 	      || new_edests == NULL || new_eclosures == NULL, 0))
-	return REG_MISSING;
+	{
+	   re_free (new_nexts);
+	   re_free (new_indices);
+	   re_free (new_edests);
+	   re_free (new_eclosures);
+	   return -1;
+	}
       dfa->nexts = new_nexts;
       dfa->org_indices = new_indices;
       dfa->edests = new_edests;
@@ -1442,7 +1447,7 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
     ((token.type == OP_PERIOD && dfa->mb_cur_max > 1)
      || token.type == COMPLEX_BRACKET);
 #endif
-  dfa->nexts[dfa->nodes_len] = REG_MISSING;
+  dfa->nexts[dfa->nodes_len] = -1;
   re_node_set_init_empty (dfa->edests + dfa->nodes_len);
   re_node_set_init_empty (dfa->eclosures + dfa->nodes_len);
   return dfa->nodes_len++;
diff --git a/gettext-tools/libgrep/regex_internal.h b/gettext-tools/libgrep/regex_internal.h
index aa42a9d..09c1917 100644
--- a/gettext-tools/libgrep/regex_internal.h
+++ b/gettext-tools/libgrep/regex_internal.h
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -151,31 +151,22 @@
 # define __attribute__(arg)
 #endif
 
-typedef __re_idx_t Idx;
-#ifdef _REGEX_LARGE_OFFSETS
-# define IDX_MAX (SIZE_MAX - 2)
-#else
-# define IDX_MAX INT_MAX
-#endif
-
-/* Special return value for failure to match.  */
-#define REG_MISSING ((Idx) -1)
-
-/* Special return value for internal error.  */
-#define REG_ERROR ((Idx) -2)
-
-/* Test whether N is a valid index, and is not one of the above.  */
-#ifdef _REGEX_LARGE_OFFSETS
-# define REG_VALID_INDEX(n) ((Idx) (n) < REG_ERROR)
-#else
-# define REG_VALID_INDEX(n) (0 <= (n))
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
 #endif
 
-/* Test whether N is a valid nonzero index.  */
+/* The type of indexes into strings.  This is signed, not size_t,
+   since the API requires indexes to fit in regoff_t anyway, and using
+   signed integers makes the code a bit smaller and presumably faster.
+   The traditional GNU regex implementation uses int for indexes.
+   The POSIX-compatible implementation uses a possibly-wider type.
+   The name 'Idx' is three letters to minimize the hassle of
+   reindenting a lot of regex code that formerly used 'int'.  */
+typedef regoff_t Idx;
 #ifdef _REGEX_LARGE_OFFSETS
-# define REG_VALID_NONZERO_INDEX(n) ((Idx) ((n) - 1) < (Idx) (REG_ERROR - 1))
+# define IDX_MAX SSIZE_MAX
 #else
-# define REG_VALID_NONZERO_INDEX(n) (0 < (n))
+# define IDX_MAX INT_MAX
 #endif
 
 /* A hash value, suitable for computing hash tables.  */
diff --git a/gettext-tools/libgrep/regexec.c b/gettext-tools/libgrep/regexec.c
index 4185d5c..7b63b1b 100644
--- a/gettext-tools/libgrep/regexec.c
+++ b/gettext-tools/libgrep/regexec.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -219,12 +219,8 @@ static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
    We return 0 if we find a match and REG_NOMATCH if not.  */
 
 int
-regexec (preg, string, nmatch, pmatch, eflags)
-    const regex_t *_Restrict_ preg;
-    const char *_Restrict_ string;
-    size_t nmatch;
-    regmatch_t pmatch[_Restrict_arr_];
-    int eflags;
+regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string,
+	 size_t nmatch, regmatch_t pmatch[], int eflags)
 {
   reg_errcode_t err;
   Idx start, length;
@@ -305,11 +301,8 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);
    match was found and -2 indicates an internal error.  */
 
 regoff_t
-re_match (bufp, string, length, start, regs)
-    struct re_pattern_buffer *bufp;
-    const char *string;
-    Idx length, start;
-    struct re_registers *regs;
+re_match (struct re_pattern_buffer *bufp, const char *string, Idx length,
+	  Idx start, struct re_registers *regs)
 {
   return re_search_stub (bufp, string, length, start, 0, length, regs, true);
 }
@@ -318,12 +311,8 @@ weak_alias (__re_match, re_match)
 #endif
 
 regoff_t
-re_search (bufp, string, length, start, range, regs)
-    struct re_pattern_buffer *bufp;
-    const char *string;
-    Idx length, start;
-    regoff_t range;
-    struct re_registers *regs;
+re_search (struct re_pattern_buffer *bufp, const char *string, Idx length,
+	   Idx start, regoff_t range, struct re_registers *regs)
 {
   return re_search_stub (bufp, string, length, start, range, length, regs,
 			 false);
@@ -333,11 +322,9 @@ weak_alias (__re_search, re_search)
 #endif
 
 regoff_t
-re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop)
-    struct re_pattern_buffer *bufp;
-    const char *string1, *string2;
-    Idx length1, length2, start, stop;
-    struct re_registers *regs;
+re_match_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1,
+	    const char *string2, Idx length2, Idx start,
+	    struct re_registers *regs, Idx stop)
 {
   return re_search_2_stub (bufp, string1, length1, string2, length2,
 			   start, 0, regs, stop, true);
@@ -347,12 +334,9 @@ weak_alias (__re_match_2, re_match_2)
 #endif
 
 regoff_t
-re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop)
-    struct re_pattern_buffer *bufp;
-    const char *string1, *string2;
-    Idx length1, length2, start, stop;
-    regoff_t range;
-    struct re_registers *regs;
+re_search_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1,
+	     const char *string2, Idx length2, Idx start, regoff_t range,
+	     struct re_registers *regs, Idx stop)
 {
   return re_search_2_stub (bufp, string1, length1, string2, length2,
 			   start, range, regs, stop, false);
@@ -362,10 +346,10 @@ weak_alias (__re_search_2, re_search_2)
 #endif
 
 static regoff_t
-re_search_2_stub (struct re_pattern_buffer *bufp,
-		  const char *string1, Idx length1,
-		  const char *string2, Idx length2,
-		  Idx start, regoff_t range, struct re_registers *regs,
+internal_function
+re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
+		  Idx length1, const char *string2, Idx length2, Idx start,
+		  regoff_t range, struct re_registers *regs,
 		  Idx stop, bool ret_len)
 {
   const char *str;
@@ -409,8 +393,8 @@ re_search_2_stub (struct re_pattern_buffer *bufp,
    otherwise the position of the match is returned.  */
 
 static regoff_t
-re_search_stub (struct re_pattern_buffer *bufp,
-		const char *string, Idx length,
+internal_function
+re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
 		Idx start, regoff_t range, Idx stop, struct re_registers *regs,
 		bool ret_len)
 {
@@ -499,6 +483,7 @@ re_search_stub (struct re_pattern_buffer *bufp,
 }
 
 static unsigned
+internal_function
 re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
 	      int regs_allocated)
 {
@@ -577,11 +562,8 @@ re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
    freeing the old data.  */
 
 void
-re_set_registers (bufp, regs, num_regs, starts, ends)
-    struct re_pattern_buffer *bufp;
-    struct re_registers *regs;
-    __re_size_t num_regs;
-    regoff_t *starts, *ends;
+re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs,
+		  __re_size_t num_regs, regoff_t *starts, regoff_t *ends)
 {
   if (num_regs)
     {
@@ -609,8 +591,7 @@ int
 # ifdef _LIBC
 weak_function
 # endif
-re_exec (s)
-     const char *s;
+re_exec (const char *s)
 {
   return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);
 }
@@ -628,12 +609,10 @@ re_exec (s)
    (0 <= LAST_START && LAST_START <= LENGTH)  */
 
 static reg_errcode_t
-__attribute_warn_unused_result__
-re_search_internal (const regex_t *preg,
-		    const char *string, Idx length,
-		    Idx start, Idx last_start, Idx stop,
-		    size_t nmatch, regmatch_t pmatch[],
-		    int eflags)
+__attribute_warn_unused_result__ internal_function
+re_search_internal (const regex_t *preg, const char *string, Idx length,
+		    Idx start, Idx last_start, Idx stop, size_t nmatch,
+		    regmatch_t pmatch[], int eflags)
 {
   reg_errcode_t err;
   const re_dfa_t *dfa = preg->buffer;
@@ -642,7 +621,7 @@ re_search_internal (const regex_t *preg,
   bool fl_longest_match;
   int match_kind;
   Idx match_first;
-  Idx match_last = REG_MISSING;
+  Idx match_last = -1;
   Idx extra_nmatch;
   bool sb;
   int ch;
@@ -851,9 +830,9 @@ re_search_internal (const regex_t *preg,
       mctx.state_log_top = mctx.nbkref_ents = mctx.max_mb_elem_len = 0;
       match_last = check_matching (&mctx, fl_longest_match,
 				   start <= last_start ? &match_first : NULL);
-      if (match_last != REG_MISSING)
+      if (match_last != -1)
 	{
-	  if (BE (match_last == REG_ERROR, 0))
+	  if (BE (match_last == -2, 0))
 	    {
 	      err = REG_ESPACE;
 	      goto free_return;
@@ -875,7 +854,7 @@ re_search_internal (const regex_t *preg,
 		    break;
 		  if (BE (err != REG_NOMATCH, 0))
 		    goto free_return;
-		  match_last = REG_MISSING;
+		  match_last = -1;
 		}
 	      else
 		break; /* We found a match.  */
@@ -886,7 +865,7 @@ re_search_internal (const regex_t *preg,
     }
 
 #ifdef DEBUG
-  assert (match_last != REG_MISSING);
+  assert (match_last != -1);
   assert (err == REG_NOERROR);
 #endif
 
@@ -964,7 +943,7 @@ re_search_internal (const regex_t *preg,
 }
 
 static reg_errcode_t
-__attribute_warn_unused_result__
+internal_function __attribute_warn_unused_result__
 prune_impossible_nodes (re_match_context_t *mctx)
 {
   const re_dfa_t *const dfa = mctx->dfa;
@@ -1012,7 +991,7 @@ prune_impossible_nodes (re_match_context_t *mctx)
 	  do
 	    {
 	      --match_last;
-	      if (! REG_VALID_INDEX (match_last))
+	      if (match_last < 0)
 		{
 		  ret = REG_NOMATCH;
 		  goto free_return;
@@ -1093,8 +1072,8 @@ acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
 }
 
 /* Check whether the regular expression match input string INPUT or not,
-   and return the index where the matching end.  Return REG_MISSING if
-   there is no match, and return REG_ERROR in case of an error.
+   and return the index where the matching end.  Return -1 if
+   there is no match, and return -2 in case of an error.
    FL_LONGEST_MATCH means we want the POSIX longest matching.
    If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
    next place where we may want to try matching.
@@ -1109,7 +1088,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
   const re_dfa_t *const dfa = mctx->dfa;
   reg_errcode_t err;
   Idx match = 0;
-  Idx match_last = REG_MISSING;
+  Idx match_last = -1;
   Idx cur_str_idx = re_string_cur_idx (&mctx->input);
   re_dfastate_t *cur_state;
   bool at_init_state = p_match_first != NULL;
@@ -1121,7 +1100,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
   if (BE (cur_state == NULL, 0))
     {
       assert (err == REG_ESPACE);
-      return REG_ERROR;
+      return -2;
     }
 
   if (mctx->state_log != NULL)
@@ -1176,7 +1155,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
 	  if (BE (err != REG_NOERROR, 0))
 	    {
 	      assert (err == REG_ESPACE);
-	      return REG_ERROR;
+	      return -2;
 	    }
 	}
 
@@ -1190,7 +1169,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
 	     state using the state log, if available and if we have not
 	     already found a valid (even if not the longest) match.  */
 	  if (BE (err != REG_NOERROR, 0))
-	    return REG_ERROR;
+	    return -2;
 
 	  if (mctx->state_log == NULL
 	      || (match && !fl_longest_match)
@@ -1273,7 +1252,7 @@ check_halt_state_context (const re_match_context_t *mctx,
 /* Compute the next node to which "NFA" transit from NODE("NFA" is a NFA
    corresponding to the DFA).
    Return the destination node, and update EPS_VIA_NODES;
-   return REG_MISSING in case of errors.  */
+   return -1 in case of errors.  */
 
 static Idx
 internal_function
@@ -1291,15 +1270,15 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
       Idx dest_node;
       ok = re_node_set_insert (eps_via_nodes, node);
       if (BE (! ok, 0))
-	return REG_ERROR;
-      /* Pick up a valid destination, or return REG_MISSING if none
+	return -2;
+      /* Pick up a valid destination, or return -1 if none
 	 is found.  */
-      for (dest_node = REG_MISSING, i = 0; i < edests->nelem; ++i)
+      for (dest_node = -1, i = 0; i < edests->nelem; ++i)
 	{
 	  Idx candidate = edests->elems[i];
 	  if (!re_node_set_contains (cur_nodes, candidate))
 	    continue;
-          if (dest_node == REG_MISSING)
+          if (dest_node == -1)
 	    dest_node = candidate;
 
 	  else
@@ -1313,7 +1292,7 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
 	      else if (fs != NULL
 		       && push_fail_stack (fs, *pidx, candidate, nregs, regs,
 					   eps_via_nodes))
-		return REG_ERROR;
+		return -2;
 
 	      /* We know we are going to exit.  */
 	      break;
@@ -1338,13 +1317,13 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
 	  if (fs != NULL)
 	    {
 	      if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1)
-		return REG_MISSING;
+		return -1;
 	      else if (naccepted)
 		{
 		  char *buf = (char *) re_string_get_buffer (&mctx->input);
 		  if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
 			      naccepted) != 0)
-		    return REG_MISSING;
+		    return -1;
 		}
 	    }
 
@@ -1353,7 +1332,7 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
 	      Idx dest_node;
 	      ok = re_node_set_insert (eps_via_nodes, node);
 	      if (BE (! ok, 0))
-		return REG_ERROR;
+		return -2;
 	      dest_node = dfa->edests[node].elems[0];
 	      if (re_node_set_contains (&mctx->state_log[*pidx]->nodes,
 					dest_node))
@@ -1369,12 +1348,12 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
 	  if (fs && (*pidx > mctx->match_last || mctx->state_log[*pidx] == NULL
 		     || !re_node_set_contains (&mctx->state_log[*pidx]->nodes,
 					       dest_node)))
-	    return REG_MISSING;
+	    return -1;
 	  re_node_set_empty (eps_via_nodes);
 	  return dest_node;
 	}
     }
-  return REG_MISSING;
+  return -1;
 }
 
 static reg_errcode_t
@@ -1410,7 +1389,7 @@ pop_fail_stack (struct re_fail_stack_t *fs, Idx *pidx, Idx nregs,
 		regmatch_t *regs, re_node_set *eps_via_nodes)
 {
   Idx num = --fs->num;
-  assert (REG_VALID_INDEX (num));
+  assert (num >= 0);
   *pidx = fs->stack[num].idx;
   memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs);
   re_node_set_free (eps_via_nodes);
@@ -1503,9 +1482,9 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,
       cur_node = proceed_next_node (mctx, nmatch, pmatch, &idx, cur_node,
 				    &eps_via_nodes, fs);
 
-      if (BE (! REG_VALID_INDEX (cur_node), 0))
+      if (BE (cur_node < 0, 0))
 	{
-	  if (BE (cur_node == REG_ERROR, 0))
+	  if (BE (cur_node == -2, 0))
 	    {
 	      re_node_set_free (&eps_via_nodes);
 	      if (prev_idx_match_malloced)
@@ -1889,10 +1868,10 @@ sub_epsilon_src_nodes (const re_dfa_t *dfa, Idx node, re_node_set *dest_nodes,
 	  {
 	    Idx edst1 = dfa->edests[cur_node].elems[0];
 	    Idx edst2 = ((dfa->edests[cur_node].nelem > 1)
-			 ? dfa->edests[cur_node].elems[1] : REG_MISSING);
+			 ? dfa->edests[cur_node].elems[1] : -1);
 	    if ((!re_node_set_contains (inv_eclosure, edst1)
 		 && re_node_set_contains (dest_nodes, edst1))
-		|| (REG_VALID_NONZERO_INDEX (edst2)
+		|| (edst2 > 0
 		    && !re_node_set_contains (inv_eclosure, edst2)
 		    && re_node_set_contains (dest_nodes, edst2)))
 	      {
@@ -1972,7 +1951,7 @@ check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
       switch (dfa->nodes[node].type)
 	{
 	case OP_BACK_REF:
-	  if (bkref_idx != REG_MISSING)
+	  if (bkref_idx != -1)
 	    {
 	      struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx;
 	      do
@@ -2088,8 +2067,8 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
       subexp_idx = dfa->nodes[ent->node].opr.idx;
       if (ent->subexp_to == str_idx)
 	{
-	  Idx ops_node = REG_MISSING;
-	  Idx cls_node = REG_MISSING;
+	  Idx ops_node = -1;
+	  Idx cls_node = -1;
 	  for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
 	    {
 	      Idx node = dest_nodes->elems[node_idx];
@@ -2104,7 +2083,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
 
 	  /* Check the limitation of the open subexpression.  */
 	  /* Note that (ent->subexp_to = str_idx != ent->subexp_from).  */
-	  if (REG_VALID_INDEX (ops_node))
+	  if (ops_node >= 0)
 	    {
 	      err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes,
 					   candidates);
@@ -2113,7 +2092,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
 	    }
 
 	  /* Check the limitation of the close subexpression.  */
-	  if (REG_VALID_INDEX (cls_node))
+	  if (cls_node >= 0)
 	    for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
 	      {
 		Idx node = dest_nodes->elems[node_idx];
@@ -2166,7 +2145,7 @@ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
   re_sift_context_t local_sctx;
   Idx first_idx = search_cur_bkref_entry (mctx, str_idx);
 
-  if (first_idx == REG_MISSING)
+  if (first_idx == -1)
     return REG_NOERROR;
 
   local_sctx.sifted_states = NULL; /* Mark that it hasn't been initialized.  */
@@ -2570,7 +2549,7 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
       if (BE (err != REG_NOERROR, 0))
 	return err;
 #ifdef DEBUG
-      assert (dfa->nexts[cur_node_idx] != REG_MISSING);
+      assert (dfa->nexts[cur_node_idx] != -1);
 #endif
       new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx];
 
@@ -2636,7 +2615,7 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
       /* And add the epsilon closures (which is 'new_dest_nodes') of
 	 the backreference to appropriate state_log.  */
 #ifdef DEBUG
-      assert (dfa->nexts[node_idx] != REG_MISSING);
+      assert (dfa->nexts[node_idx] != -1);
 #endif
       for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx)
 	{
@@ -2720,7 +2699,7 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
   const char *buf = (const char *) re_string_get_buffer (&mctx->input);
   /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX.  */
   Idx cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx);
-  if (cache_idx != REG_MISSING)
+  if (cache_idx != -1)
     {
       const struct re_backref_cache_entry *entry
 	= mctx->bkref_ents + cache_idx;
@@ -2825,7 +2804,7 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
 	  nodes = &mctx->state_log[sl_str]->nodes;
 	  cls_node = find_subexp_node (dfa, nodes, subexp_num,
 				       OP_CLOSE_SUBEXP);
-	  if (cls_node == REG_MISSING)
+	  if (cls_node == -1)
 	    continue; /* No.  */
 	  if (sub_top->path == NULL)
 	    {
@@ -2904,7 +2883,7 @@ find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
 	  && node->opr.idx == subexp_idx)
 	return cls_node;
     }
-  return REG_MISSING;
+  return -1;
 }
 
 /* Check whether the node TOP_NODE at TOP_STR can arrive to the node
@@ -3180,7 +3159,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
       Idx cur_node = cur_nodes->elems[idx];
       const re_node_set *eclosure = dfa->eclosures + cur_node;
       outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type);
-      if (outside_node == REG_MISSING)
+      if (outside_node == -1)
 	{
 	  /* There are no problematic nodes, just merge them.  */
 	  err = re_node_set_merge (&new_nodes, eclosure);
@@ -3266,7 +3245,7 @@ expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
   Idx cache_idx_start = search_cur_bkref_entry (mctx, cur_str);
   struct re_backref_cache_entry *ent;
 
-  if (cache_idx_start == REG_MISSING)
+  if (cache_idx_start == -1)
     return REG_NOERROR;
 
  restart:
@@ -3391,7 +3370,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
   /* At first, group all nodes belonging to 'state' into several
      destinations.  */
   ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch);
-  if (BE (! REG_VALID_NONZERO_INDEX (ndests), 0))
+  if (BE (ndests <= 0, 0))
     {
       if (dests_node_malloced)
 	free (dests_alloc);
@@ -3453,7 +3432,7 @@ out_free:
       for (j = 0; j < dests_node[i].nelem; ++j)
 	{
 	  next_node = dfa->nexts[dests_node[i].elems[j]];
-	  if (next_node != REG_MISSING)
+	  if (next_node != -1)
 	    {
 	      err = re_node_set_merge (&follows, dfa->eclosures + next_node);
 	      if (BE (err != REG_NOERROR, 0))
@@ -3764,7 +3743,7 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
  error_return:
   for (j = 0; j < ndests; ++j)
     re_node_set_free (dests_node + j);
-  return REG_MISSING;
+  return -1;
 }
 
 #ifdef RE_ENABLE_I18N
@@ -4195,7 +4174,7 @@ internal_function __attribute_warn_unused_result__
 match_ctx_init (re_match_context_t *mctx, int eflags, Idx n)
 {
   mctx->eflags = eflags;
-  mctx->match_last = REG_MISSING;
+  mctx->match_last = -1;
   if (n > 0)
     {
       /* Avoid overflow.  */
@@ -4316,7 +4295,7 @@ match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from,
   return REG_NOERROR;
 }
 
-/* Return the first entry with the same str_idx, or REG_MISSING if none is
+/* Return the first entry with the same str_idx, or -1 if none is
    found.  Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX.  */
 
 static Idx
@@ -4336,7 +4315,7 @@ search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
   if (left < last && mctx->bkref_ents[left].str_idx == str_idx)
     return left;
   else
-    return REG_MISSING;
+    return -1;
 }
 
 /* Register the node NODE, whose type is OP_OPEN_SUBEXP, and which matches
diff --git a/gettext-tools/libgrep/wcrtomb.c b/gettext-tools/libgrep/wcrtomb.c
index b38d2e0..b931ee9 100644
--- a/gettext-tools/libgrep/wcrtomb.c
+++ b/gettext-tools/libgrep/wcrtomb.c
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2008-2015 Free Software Foundation, Inc.
+   Copyright (C) 2008-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/m4/Makefile.in b/gettext-tools/m4/Makefile.in
index d11a26c..407d71f 100644
--- a/gettext-tools/m4/Makefile.in
+++ b/gettext-tools/m4/Makefile.in
@@ -121,6 +121,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -157,6 +158,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-tools/m4/exported.m4 b/gettext-tools/m4/exported.m4
index e7283cf..01ebbcf 100644
--- a/gettext-tools/m4/exported.m4
+++ b/gettext-tools/m4/exported.m4
@@ -1,5 +1,5 @@
 # exported.m4 serial 1 (gettext-0.18)
-dnl Copyright (C) 2006, 2009, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/m4/hostname.m4 b/gettext-tools/m4/hostname.m4
index 5d381f6..64e5ea7 100644
--- a/gettext-tools/m4/hostname.m4
+++ b/gettext-tools/m4/hostname.m4
@@ -1,5 +1,5 @@
 # hostname.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2002, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/m4/setlocale.m4 b/gettext-tools/m4/setlocale.m4
index 8f60754..a404aff 100644
--- a/gettext-tools/m4/setlocale.m4
+++ b/gettext-tools/m4/setlocale.m4
@@ -1,5 +1,5 @@
 # setlocale.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 2001-2002, 2006, 2009, 2015 Free Software Foundation,
+dnl Copyright (C) 2001-2002, 2006, 2009, 2015-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-tools/m4/siginfo.m4 b/gettext-tools/m4/siginfo.m4
index bd5892a..7a3ff55 100644
--- a/gettext-tools/m4/siginfo.m4
+++ b/gettext-tools/m4/siginfo.m4
@@ -1,5 +1,5 @@
 # siginfo.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2002, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am
index e13dc25..e50b2eb 100644
--- a/gettext-tools/man/Makefile.am
+++ b/gettext-tools/man/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gettext-tools/man subdirectory of GNU gettext
-## Copyright (C) 2001-2003, 2006-2007, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 2001-2003, 2006-2007, 2015-2016 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
diff --git a/gettext-tools/man/Makefile.in b/gettext-tools/man/Makefile.in
index b43801d..32bbf8f 100644
--- a/gettext-tools/man/Makefile.in
+++ b/gettext-tools/man/Makefile.in
@@ -118,6 +118,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -154,6 +155,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-tools/man/autopoint.1 b/gettext-tools/man/autopoint.1
index 59d99c6..c92b410 100644
--- a/gettext-tools/man/autopoint.1
+++ b/gettext-tools/man/autopoint.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOPOINT "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH AUTOPOINT "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 autopoint \- copies standard gettext infrastructure
 .SH SYNOPSIS
diff --git a/gettext-tools/man/gettextize.1 b/gettext-tools/man/gettextize.1
index d32d910..52789dc 100644
--- a/gettext-tools/man/gettextize.1
+++ b/gettext-tools/man/gettextize.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH GETTEXTIZE "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH GETTEXTIZE "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 gettextize \- install or upgrade gettext infrastructure
 .SH SYNOPSIS
diff --git a/gettext-tools/man/help2man b/gettext-tools/man/help2man
index 1b6ad65..296778d 100755
--- a/gettext-tools/man/help2man
+++ b/gettext-tools/man/help2man
@@ -31,7 +31,7 @@ my $this_version = '1.24';
 my $version_info = <<EOT;
 GNU $this_program $this_version
 
-Copyright (C) 1997-2000, 2015 Free Software Foundation, Inc.
+Copyright (C) 1997-2000, 2015-2016 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
diff --git a/gettext-tools/man/msgattrib.1 b/gettext-tools/man/msgattrib.1
index fb61853..2436a71 100644
--- a/gettext-tools/man/msgattrib.1
+++ b/gettext-tools/man/msgattrib.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGATTRIB "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGATTRIB "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgattrib \- attribute matching and manipulation on message catalog
 .SH SYNOPSIS
@@ -152,7 +152,7 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2001-2010 Free Software Foundation, Inc.
+Copyright \(co 2001-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgattrib.1.html b/gettext-tools/man/msgattrib.1.html
index 6db6287..f79e467 100644
--- a/gettext-tools/man/msgattrib.1.html
+++ b/gettext-tools/man/msgattrib.1.html
@@ -335,7 +335,7 @@ Bruno Haible.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
+&copy; 2001-2016 Free Software Foundation, Inc. License
 GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgcat.1 b/gettext-tools/man/msgcat.1
index 0b67f4a..15929e3 100644
--- a/gettext-tools/man/msgcat.1
+++ b/gettext-tools/man/msgcat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCAT "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGCAT "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgcat \- combines several message catalogs
 .SH SYNOPSIS
@@ -132,7 +132,7 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2001-2010 Free Software Foundation, Inc.
+Copyright \(co 2001-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgcat.1.html b/gettext-tools/man/msgcat.1.html
index 7486f52..b5970d1 100644
--- a/gettext-tools/man/msgcat.1.html
+++ b/gettext-tools/man/msgcat.1.html
@@ -285,7 +285,7 @@ Bruno Haible.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
+&copy; 2001-2016 Free Software Foundation, Inc. License
 GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgcmp.1 b/gettext-tools/man/msgcmp.1
index c6aa423..b996761 100644
--- a/gettext-tools/man/msgcmp.1
+++ b/gettext-tools/man/msgcmp.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCMP "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGCMP "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgcmp \- compare message catalog and template
 .SH SYNOPSIS
@@ -59,7 +59,7 @@ Written by Peter Miller.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2010 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgcmp.1.html b/gettext-tools/man/msgcmp.1.html
index 67d4430..856c01b 100644
--- a/gettext-tools/man/msgcmp.1.html
+++ b/gettext-tools/man/msgcmp.1.html
@@ -166,7 +166,7 @@ Peter Miller.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
+&copy; 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgcomm.1 b/gettext-tools/man/msgcomm.1
index f51a544..7bfc1e0 100644
--- a/gettext-tools/man/msgcomm.1
+++ b/gettext-tools/man/msgcomm.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCOMM "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGCOMM "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgcomm \- match two message catalogs
 .SH SYNOPSIS
@@ -124,7 +124,7 @@ Written by Peter Miller.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2010 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgcomm.1.html b/gettext-tools/man/msgcomm.1.html
index 083387f..ec87351 100644
--- a/gettext-tools/man/msgcomm.1.html
+++ b/gettext-tools/man/msgcomm.1.html
@@ -273,7 +273,7 @@ Peter Miller.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
+&copy; 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgconv.1 b/gettext-tools/man/msgconv.1
index 5dbde0a..4aee337 100644
--- a/gettext-tools/man/msgconv.1
+++ b/gettext-tools/man/msgconv.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGCONV "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGCONV "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgconv \- character set conversion for message catalog
 .SH SYNOPSIS
@@ -103,7 +103,7 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2001-2010 Free Software Foundation, Inc.
+Copyright \(co 2001-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgconv.1.html b/gettext-tools/man/msgconv.1.html
index 90f077d..752b084 100644
--- a/gettext-tools/man/msgconv.1.html
+++ b/gettext-tools/man/msgconv.1.html
@@ -239,7 +239,7 @@ Bruno Haible.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
+&copy; 2001-2016 Free Software Foundation, Inc. License
 GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgen.1 b/gettext-tools/man/msgen.1
index 023e54f..794c5b1 100644
--- a/gettext-tools/man/msgen.1
+++ b/gettext-tools/man/msgen.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEN "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGEN "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgen \- create English message catalog
 .SH SYNOPSIS
@@ -103,7 +103,7 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2001-2010 Free Software Foundation, Inc.
+Copyright \(co 2001-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgen.1.html b/gettext-tools/man/msgen.1.html
index 8e1b723..35d0b2a 100644
--- a/gettext-tools/man/msgen.1.html
+++ b/gettext-tools/man/msgen.1.html
@@ -237,7 +237,7 @@ Bruno Haible.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
+&copy; 2001-2016 Free Software Foundation, Inc. License
 GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgexec.1 b/gettext-tools/man/msgexec.1
index 23fdaa3..4a3c765 100644
--- a/gettext-tools/man/msgexec.1
+++ b/gettext-tools/man/msgexec.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGEXEC "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGEXEC "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgexec \- process translations of message catalog
 .SH SYNOPSIS
@@ -50,7 +50,7 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2001-2010 Free Software Foundation, Inc.
+Copyright \(co 2001-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgexec.1.html b/gettext-tools/man/msgexec.1.html
index 3fdd0a0..2db4a2d 100644
--- a/gettext-tools/man/msgexec.1.html
+++ b/gettext-tools/man/msgexec.1.html
@@ -140,7 +140,7 @@ Bruno Haible.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
+&copy; 2001-2016 Free Software Foundation, Inc. License
 GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgfilter.1 b/gettext-tools/man/msgfilter.1
index ea6faa3..aa4b860 100644
--- a/gettext-tools/man/msgfilter.1
+++ b/gettext-tools/man/msgfilter.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFILTER "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGFILTER "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgfilter \- edit translations of message catalog
 .SH SYNOPSIS
@@ -119,7 +119,7 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2001-2010 Free Software Foundation, Inc.
+Copyright \(co 2001-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgfilter.1.html b/gettext-tools/man/msgfilter.1.html
index b0542a3..b905714 100644
--- a/gettext-tools/man/msgfilter.1.html
+++ b/gettext-tools/man/msgfilter.1.html
@@ -268,7 +268,7 @@ Bruno Haible.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
+&copy; 2001-2016 Free Software Foundation, Inc. License
 GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgfmt.1 b/gettext-tools/man/msgfmt.1
index 7a7fb8d..e3a0958 100644
--- a/gettext-tools/man/msgfmt.1
+++ b/gettext-tools/man/msgfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGFMT "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGFMT "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgfmt \- compile message catalog to binary format
 .SH SYNOPSIS
@@ -198,7 +198,7 @@ Written by Ulrich Drepper.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2010 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgfmt.1.html b/gettext-tools/man/msgfmt.1.html
index 1ef3670..ca906d1 100644
--- a/gettext-tools/man/msgfmt.1.html
+++ b/gettext-tools/man/msgfmt.1.html
@@ -436,7 +436,7 @@ Ulrich Drepper.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
+&copy; 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msggrep.1 b/gettext-tools/man/msggrep.1
index a34f1cc..16a02a2 100644
--- a/gettext-tools/man/msggrep.1
+++ b/gettext-tools/man/msggrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGGREP "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGGREP "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msggrep \- pattern matching on message catalog
 .SH SYNOPSIS
@@ -162,7 +162,7 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2001-2010 Free Software Foundation, Inc.
+Copyright \(co 2001-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msggrep.1.html b/gettext-tools/man/msggrep.1.html
index 69ae9a8..5bbee51 100644
--- a/gettext-tools/man/msggrep.1.html
+++ b/gettext-tools/man/msggrep.1.html
@@ -343,7 +343,7 @@ Bruno Haible.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
+&copy; 2001-2016 Free Software Foundation, Inc. License
 GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msginit.1 b/gettext-tools/man/msginit.1
index 65c3aed..b2f9d89 100644
--- a/gettext-tools/man/msginit.1
+++ b/gettext-tools/man/msginit.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGINIT "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGINIT "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msginit \- initialize a message catalog
 .SH SYNOPSIS
@@ -75,7 +75,7 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2001-2010 Free Software Foundation, Inc.
+Copyright \(co 2001-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msginit.1.html b/gettext-tools/man/msginit.1.html
index 6a84fa5..32bcad5 100644
--- a/gettext-tools/man/msginit.1.html
+++ b/gettext-tools/man/msginit.1.html
@@ -186,7 +186,7 @@ Bruno Haible.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
+&copy; 2001-2016 Free Software Foundation, Inc. License
 GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgmerge.1 b/gettext-tools/man/msgmerge.1
index f77fb58..52eec2f 100644
--- a/gettext-tools/man/msgmerge.1
+++ b/gettext-tools/man/msgmerge.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGMERGE "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGMERGE "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgmerge \- merge message catalog and template
 .SH SYNOPSIS
@@ -162,7 +162,7 @@ Written by Peter Miller.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2010 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgmerge.1.html b/gettext-tools/man/msgmerge.1.html
index 507b78f..1a3316d 100644
--- a/gettext-tools/man/msgmerge.1.html
+++ b/gettext-tools/man/msgmerge.1.html
@@ -343,7 +343,7 @@ Peter Miller.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
+&copy; 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msgunfmt.1 b/gettext-tools/man/msgunfmt.1
index b802129..4ef1e05 100644
--- a/gettext-tools/man/msgunfmt.1
+++ b/gettext-tools/man/msgunfmt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNFMT "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGUNFMT "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msgunfmt \- uncompile message catalog from binary format
 .SH SYNOPSIS
@@ -127,7 +127,7 @@ Written by Ulrich Drepper.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2010 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msgunfmt.1.html b/gettext-tools/man/msgunfmt.1.html
index 559dc61..38694d1 100644
--- a/gettext-tools/man/msgunfmt.1.html
+++ b/gettext-tools/man/msgunfmt.1.html
@@ -289,7 +289,7 @@ Ulrich Drepper.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2010 Free Software Foundation, Inc.
+&copy; 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/msguniq.1 b/gettext-tools/man/msguniq.1
index 612382a..b66a71a 100644
--- a/gettext-tools/man/msguniq.1
+++ b/gettext-tools/man/msguniq.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MSGUNIQ "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH MSGUNIQ "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 msguniq \- unify duplicate translations in message catalog
 .SH SYNOPSIS
@@ -118,7 +118,7 @@ Written by Bruno Haible.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2001-2010 Free Software Foundation, Inc.
+Copyright \(co 2001-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/msguniq.1.html b/gettext-tools/man/msguniq.1.html
index 2f59b86..6023329 100644
--- a/gettext-tools/man/msguniq.1.html
+++ b/gettext-tools/man/msguniq.1.html
@@ -264,7 +264,7 @@ Bruno Haible.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 2001-2010 Free Software Foundation, Inc. License
+&copy; 2001-2016 Free Software Foundation, Inc. License
 GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/man/recode-sr-latin.1 b/gettext-tools/man/recode-sr-latin.1
index 9e0de14..94516b6 100644
--- a/gettext-tools/man/recode-sr-latin.1
+++ b/gettext-tools/man/recode-sr-latin.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH RECODE-SR-LATIN "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH RECODE-SR-LATIN "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 recode-sr-latin \- convert Serbian text from Cyrillic to Latin script
 .SH SYNOPSIS
diff --git a/gettext-tools/man/x-to-1.in b/gettext-tools/man/x-to-1.in
index 0169c71..c65b47e 100644
--- a/gettext-tools/man/x-to-1.in
+++ b/gettext-tools/man/x-to-1.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2001, 2003, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2015-2016 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
diff --git a/gettext-tools/man/xgettext.1 b/gettext-tools/man/xgettext.1
index 59fe79b..950f4e9 100644
--- a/gettext-tools/man/xgettext.1
+++ b/gettext-tools/man/xgettext.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH XGETTEXT "1" "December 2015" "GNU gettext-tools 0.19.7" GNU
+.TH XGETTEXT "1" "June 2016" "GNU gettext-tools 0.19.8.1" GNU
 .SH NAME
 xgettext \- extract gettext strings from source
 .SH SYNOPSIS
@@ -77,7 +77,7 @@ in output file
 perform syntax check on messages
 (ellipsis-unicode, space-ellipsis,
 .IP
-quote-unicode)
+quote-unicode, bullet-unicode)
 .TP
 \fB\-\-sentence\-end\fR=\fITYPE\fR
 type describing the end of sentence
@@ -116,6 +116,10 @@ Lua, JavaScript, Vala)
 understand ANSI C trigraphs for input
 (only languages C, C++, ObjectiveC)
 .TP
+\fB\-\-its\fR=\fIFILE\fR
+apply ITS rules from FILE
+(only XML based languages)
+.TP
 \fB\-\-qt\fR
 recognize Qt format strings
 (only language C++)
@@ -169,9 +173,6 @@ write out a Java .properties file
 \fB\-\-stringtable\-output\fR
 write out a NeXTstep/GNUstep .strings file
 .TP
-\fB\-\-its\fR=\fIFILE\fR
-apply ITS rules from FILE
-.TP
 \fB\-\-itstool\fR
 write out itstool comments
 .TP
@@ -225,7 +226,7 @@ Written by Ulrich Drepper.
 .SH "REPORTING BUGS"
 Report bugs to <bug-gnu-gettext@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 1995-1998, 2000-2013 Free Software Foundation, Inc.
+Copyright \(co 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
diff --git a/gettext-tools/man/xgettext.1.html b/gettext-tools/man/xgettext.1.html
index d43fdbe..7f3afbc 100644
--- a/gettext-tools/man/xgettext.1.html
+++ b/gettext-tools/man/xgettext.1.html
@@ -164,8 +164,8 @@ preceding keyword lines in output file</p>
 <p style="margin-left:22%;">perform syntax check on
 messages (ellipsis-unicode, space-ellipsis,</p>
 
-
-<p style="margin-left:22%; margin-top: 1em">quote-unicode)</p>
+<p style="margin-left:22%; margin-top: 1em">quote-unicode,
+bullet-unicode)</p>
 
 
 <p style="margin-left:11%;"><b>&minus;&minus;sentence&minus;end</b>=<i>TYPE</i></p>
@@ -216,6 +216,12 @@ JavaScript, Vala)</p>
 <p style="margin-left:22%;">understand ANSI C trigraphs for
 input (only languages C, C++, ObjectiveC)</p>
 
+
+<p style="margin-left:11%;"><b>&minus;&minus;its</b>=<i>FILE</i></p>
+
+<p style="margin-left:22%;">apply ITS rules from FILE (only
+XML based languages)</p>
+
 <table width="100%" border="0" rules="none" frame="void"
        cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
@@ -331,11 +337,6 @@ file</p>
 .strings file</p>
 
 
-<p style="margin-left:11%;"><b>&minus;&minus;its</b>=<i>FILE</i></p>
-
-<p style="margin-left:22%;">apply ITS rules from FILE</p>
-
-
 <p style="margin-left:11%;"><b>&minus;&minus;itstool</b></p>
 
 <p style="margin-left:22%;">write out itstool comments</p>
@@ -444,7 +445,7 @@ Ulrich Drepper.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright
-&copy; 1995-1998, 2000-2013 Free Software Foundation, Inc.
+&copy; 1995-1998, 2000-2016 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later
 &lt;http://gnu.org/licenses/gpl.html&gt; <br>
 This is free software: you are free to change and
diff --git a/gettext-tools/misc/Makefile.am b/gettext-tools/misc/Makefile.am
index 31d3d25..ea8231e 100644
--- a/gettext-tools/misc/Makefile.am
+++ b/gettext-tools/misc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/misc subdirectory of GNU gettext
-## Copyright (C) 1995-1997, 2000-2003, 2005-2007, 2009-2010, 2015 Free
+## Copyright (C) 1995-1997, 2000-2003, 2005-2007, 2009-2010, 2015-2016 Free
 ## Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/misc/Makefile.in b/gettext-tools/misc/Makefile.in
index 2166502..ec6501e 100644
--- a/gettext-tools/misc/Makefile.in
+++ b/gettext-tools/misc/Makefile.in
@@ -121,6 +121,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -157,6 +158,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-tools/misc/add-to-archive b/gettext-tools/misc/add-to-archive
index 300234d..ed66e6d 100755
--- a/gettext-tools/misc/add-to-archive
+++ b/gettext-tools/misc/add-to-archive
@@ -1,7 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002, 2006, 2009-2010, 2015 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2006, 2009-2010, 2015-2016 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
diff --git a/gettext-tools/misc/archive.dir.tar b/gettext-tools/misc/archive.dir.tar
index 521ebe7..b90ae85 100644
--- a/gettext-tools/misc/archive.dir.tar
+++ b/gettext-tools/misc/archive.dir.tar
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 45452c3..6d0746f 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 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
@@ -378,7 +378,7 @@ case "$ver" in
   0.16 | 0.16.1 | \
   0.17 | \
   0.18 | 0.18.1 | 0.18.2 | 0.18.3 | \
-  0.19 | 0.19.1 | 0.19.2 | 0.19.3 | 0.19.4 | 0.19.5 | 0.19.6 | 0.19.7 )
+  0.19 | 0.19.1 | 0.19.2 | 0.19.3 | 0.19.4 | 0.19.5 | 0.19.6 | 0.19.7 | 0.19.8 )
     ;;
   *)
     func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in
diff --git a/gettext-tools/misc/convert-archive.in b/gettext-tools/misc/convert-archive.in
index a540d82..8d5859b 100644
--- a/gettext-tools/misc/convert-archive.in
+++ b/gettext-tools/misc/convert-archive.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2009-2010, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2010, 2015-2016 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
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 286a253..05ad66a 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 1995-1998, 2000-2015 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2016 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
diff --git a/gettext-tools/misc/po-compat.el b/gettext-tools/misc/po-compat.el
index 8f89b14..e40a8d7 100644
--- a/gettext-tools/misc/po-compat.el
+++ b/gettext-tools/misc/po-compat.el
@@ -1,6 +1,6 @@
 ;;; po-compat.el --- basic support of PO translation files -*- coding: latin-1; -*-
 
-;; Copyright (C) 1995-2002, 2010, 2015 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2002, 2010, 2015-2016 Free Software Foundation, Inc.
 
 ;; Authors: François Pinard <pinard@iro.umontreal.ca>,
 ;;          Greg McGary <gkm@magilla.cichlid.com>,
diff --git a/gettext-tools/misc/po-mode.el b/gettext-tools/misc/po-mode.el
index e6016e1..9189cb3 100644
--- a/gettext-tools/misc/po-mode.el
+++ b/gettext-tools/misc/po-mode.el
@@ -1,6 +1,6 @@
 ;;; po-mode.el -- major mode for GNU gettext PO files
 
-;; Copyright (C) 1995-2002, 2005-2008, 2010, 2015 Free Software
+;; Copyright (C) 1995-2002, 2005-2008, 2010, 2015-2016 Free Software
 ;; Foundation, Inc.
 
 ;; Authors: François Pinard <pinard@iro.umontreal.ca>
diff --git a/gettext-tools/misc/start-po.el b/gettext-tools/misc/start-po.el
index 21bfba5..92edb6b 100644
--- a/gettext-tools/misc/start-po.el
+++ b/gettext-tools/misc/start-po.el
@@ -1,6 +1,6 @@
 ;;; start-po.el -- autoload definitions for viewing and editing PO files
 
-;; Copyright (C) 1995-2004, 2015 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2004, 2015-2016 Free Software Foundation, Inc.
 ;;
 ;; This file is part of GNU gettext.
 ;;
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 11cec76..b3d024a 100644
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,30 @@
+2016-06-09  Daiki Ueno  <ueno@gnu.org>
+
+	Update translations
+	* gettext-runtime/po/eo.po: Update from Felipe Castro <fefcas@gmail.com>
+	* gettext-runtime/po/hr.po: Update from Božidar Putanec <bozidarp@yahoo.com>
+	* gettext-runtime/po/sv.po: Update from Göran Uddeborg <goeran@uddeborg.se>
+	* gettext-tools/examples/po/eo.po: Update from Felipe Castro <fefcas@gmail.com>
+	* gettext-tools/examples/po/hr.po: Update from Božidar Putanec <bozidarp@yahoo.com>
+	* gettext-tools/examples/po/sv.po: Update from Göran Uddeborg <goeran@uddeborg.se>
+	* gettext-tools/po/bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>
+	* gettext-tools/po/es.po: Update from Antonio Ceballos <aceballos@gmail.com>
+	* gettext-tools/po/fr.po: Update from Stéphane Aulery <lkppo@free.fr>
+	* gettext-tools/po/ja.po: Update from Masahito Yamaga <ma@yama-ga.com>
+	* gettext-tools/po/ko.po: Update from Changwoo Ryu <cwryu@debian.org>
+	* gettext-tools/po/nl.po: Update from Benno Schulenberg <benno@vertaalt.nl>
+	* gettext-tools/po/pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>
+	* gettext-tools/po/sk.po: Update from Marcel Telka <marcel@telka.sk>
+	* gettext-tools/po/sr.po: Update from Миро�лав �иколић <miroslavnikolic@rocketmail.com>
+	* gettext-tools/po/sv.po: Update from Göran Uddeborg <goeran@uddeborg.se>
+	* gettext-tools/po/tr.po: Update from Nilgün Belma Bugüner <nilgun@buguner.name.tr>
+	* gettext-tools/po/uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>
+	* gettext-tools/po/vi.po: Update from Trần Ng�c Quân <vnwildman@gmail.com>
+
+2016-01-02  Daiki Ueno  <ueno@gnu.org>
+
+	maint: Update copyright year
+
 2015-12-28  Daiki Ueno  <ueno@gnu.org>
 
 	Update translations
diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in
index 8f34f00..38c293d 100644
--- a/gettext-tools/po/Makefile.in.in
+++ b/gettext-tools/po/Makefile.in.in
@@ -6,7 +6,7 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 #
-# Origin: gettext-0.19.7
+# Origin: gettext-0.19.8
 GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
diff --git a/gettext-tools/po/POTFILES.in b/gettext-tools/po/POTFILES.in
index 89c988f..a42c5ea 100644
--- a/gettext-tools/po/POTFILES.in
+++ b/gettext-tools/po/POTFILES.in
@@ -1,5 +1,6 @@
 # List of files which contain translatable strings.
-# Copyright (C) 1995, 1998, 2001-2006, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1998, 2001-2006, 2011, 2016 Free Software Foundation,
+# Inc.
 
 # For updating this file, look at the result of:
 #   $ LC_ALL=C grep -l '[^A-Za-z_]_(' {gnulib-lib,src,libgettextpo}/*.[chly]
diff --git a/gettext-tools/po/be.gmo b/gettext-tools/po/be.gmo
index 2cacf19..1f49c7f 100644
--- a/gettext-tools/po/be.gmo
+++ b/gettext-tools/po/be.gmo
diff --git a/gettext-tools/po/be.po b/gettext-tools/po/be.po
index 6504517..0469125 100644
--- a/gettext-tools/po/be.po
+++ b/gettext-tools/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2002-09-04 18:51+0300\n"
 "Last-Translator: Ales Nyakhaychyk <i18n@infonet.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
@@ -113,7 +113,7 @@ msgid "Unknown system error"
 msgstr "�ев�дома� �і�т�мна� памылка"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -127,7 +127,7 @@ msgstr "%s: выбар `%s' неадназначны\n"
 #: gnulib-lib/getopt.c:619
 #, fuzzy, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: выбар `-W %s' неадназначны\n"
+msgstr "%s: выбар `%s' неадназначны\n"
 
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
 #, fuzzy, c-format
@@ -191,15 +191,15 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "немагчыма �тварыць \"%s\""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -223,39 +223,39 @@ msgid "%s subprocess I/O error"
 msgstr "падпрац�� %s, памылка ўводу-вываду"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "пам�ць вычарпана"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "памылка запі�у ў падпрац�� %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "памылка чытаньн� з падпрац��а %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "немагчыма ў�тал�ваць неблакіруючы ўвод-вывад у падпрац�� %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "памылка ўзаемадзе�ньн� з падпрац��ам %s"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "падпрац�� %s завершыў�� з кодам выхаду %d"
@@ -294,18 +294,18 @@ msgstr ""
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "не магчыма �тварыць канве�р"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "немагчыма �тварыць файл вываду \"%s\""
@@ -337,11 +337,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Па�прабуйце \"%s --help\" дл� больш падраб�зных зьве�так.\n"
@@ -361,7 +361,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -376,21 +376,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr ""
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -403,20 +403,20 @@ msgstr ""
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Паведамл�йце аб памылках на адра� <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -426,10 +426,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�ўтар %s.\n"
@@ -445,11 +445,9 @@ msgid "%s cannot be read"
 msgstr ""
 
 #: src/cldr-plurals.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "cannot extract rules for %s"
 msgstr ""
-"немагчыма �тварыць ча�овую дыр�кторыю,\n"
-"выкары�тоўвываючы ўзор \"%s\""
 
 #: src/cldr-plurals.c:331
 #, c-format
@@ -462,37 +460,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "памылка ў ча� чытаньн� файла \"%s\""
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "�п�цыфікацы� фармату дл� аргум�нта %u, �к у '%s', н� й�нуе ў 'msgid'"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "�п�цыфікацы� фармату дл� аргум�нта %u н� й�нуе ў '%s'"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -526,8 +524,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "колька�ьць �п�цыфікацый фармату ў 'msgid' і '%s' не �упадае"
@@ -819,8 +816,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "�п�цыфікацыі фармата ў '%s' не з'�ўл�юцца падмно�твам �п�цыфікацый у 'msgid'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "�пц�ыфікацы� фармату дл� аргум�нта \"%s\" н� й�нуе ў \"%s\""
@@ -837,60 +834,60 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "�п�цыфікацыі фармата ў '%s' не з'�ўл�юцца падмно�твам �п�цыфікацый у 'msgid'"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "�п�цыфікацыі фармата ў '%s' не з'�ўл�юцца падмно�твам �п�цыфікацый у 'msgid'"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "�п�цыфікацыі фармату дл� аргум�нту '%s', �к у '%s', не і�нуюць у'msgid'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -938,7 +935,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -988,11 +985,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
@@ -1064,12 +1061,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "па большай ча�тцы адзін уваходз�чы файл зацьверджан"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s і %s узаема выключны"
@@ -1088,7 +1085,7 @@ msgstr ""
 "Фільтруе паведамленьні каталёга перакладаў �уадно�на іх атрыбутам, а так �ама,\n"
 "узьдзейнічае на іх\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1098,10 +1095,10 @@ msgid ""
 msgstr ""
 "�ргум�нты, абав�зковы� дл� доўгіх выбараў, абав�зковы й дл� кароткіх.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "невызначан уваходз�чы файл"
@@ -1111,10 +1108,10 @@ msgstr "невызначан уваходз�чы файл"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1129,23 +1126,23 @@ msgstr ""
 "  Ф�ЙЛ ...                 .mo файлы\n"
 "Калі ўваходз�чы файл не зададзен, ці заме�т �го -, чытае �тандартны ўвод.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, fuzzy, c-format
@@ -1158,7 +1155,7 @@ msgstr ""
 "Вынікі запі�ваюцца ў �тандартны вывад, калі йм� файла дл� вываду не\n"
 "зададзена, ці заме�т �го -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -1263,9 +1260,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1286,17 +1283,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1305,118 +1302,118 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "зададзен немагчымы крыт�рый выбару (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р] [УВ�ХОДЗЯЧЫ_Ф�ЙЛ]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1440,51 +1437,51 @@ msgstr ""
 "будуць уз�ты  з першага PO-файла.\n"
 "Пазіцыі з у�іх PO-файлаў будуць аб'�днаны ў кучу\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1492,26 +1489,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1618,7 +1615,7 @@ msgstr "г�та паведамленьне выкары�тоўваецца, а
 msgid "warning: this message is not used"
 msgstr "увага: г�та паведамленьне не выкары�тоўваецца"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1626,12 +1623,12 @@ msgstr[0] "знойдзена %d фатальна� памылка"
 msgstr[1] "знойдзена %d фатальны� памылкі"
 msgstr[2] "знойдзена %d фатальных памылак"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "неабходна задаць не менш двух файлаў"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1652,14 +1649,14 @@ msgstr ""
 "кам�нтары будуць захаваны, але толькі зь першага PO файла, у �кім �ны былі\n"
 "вызначаны.  Каментары �тановішчаў у файлах з у�іх PO файлаў будуць аб'�днаны.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1707,7 +1704,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "невызначан уваходз�чы файл"
@@ -1882,76 +1879,76 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "файл \"%s\" зм�шчае радок не завершаны нулём"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргум�нт %s павінен быць адзіночным знакам прыпынку"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s патрабуе \"-d дыр�кторы�\" �п�цыфікацыі"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s патрабуе \"-l locale\" �п�цыфікацыі"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, fuzzy, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s патрабуе \"-l locale\" �п�цыфікацыі"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, fuzzy, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s патрабуе \"-l locale\" �п�цыфікацыі"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s і %s узаема выключны"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s р�чаі�ны толькі з %s ці %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s р�чаі�ны толькі з %s ці %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "немагчыма �тварыць файл вываду \"%s\""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1959,7 +1956,7 @@ msgstr[0] "%d паведамленьне перакладзена"
 msgstr[1] "%d паведамленьні перакладзена"
 msgstr[2] "%d паведамленьн�ў перакладзена"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1973,7 +1970,7 @@ msgstr[2] ""
 ",\n"
 "%d недакладных перакладаў"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1987,119 +1984,116 @@ msgstr[2] ""
 ",\n"
 "%d неперакладзеных паведамленьн�ў"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Выкары�таньне: %s [ВЫБ�Р] файл.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Стварае дваічны каталёг паведамленьн�ў зь іх т�к�тавага апі�аньн�.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
-#, fuzzy, c-format
+#: src/msgfmt.c:947
+#, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
-"Р�жым дзе�ньн�:\n"
-"  -j, --java               Java р�жым: увод г�та ResourceBundle кл��\n"
-"      --tcl                Tcl р�жым: увод г�та tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, fuzzy, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2117,65 +2111,65 @@ msgstr ""
 "абмежаваным падкр��ьліваньнем.  Выбар -d абав�зковы.  Кл�� запі�ваецца ў\n"
 "зададзеную дыр�кторыю.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2183,27 +2177,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2211,33 +2205,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2245,12 +2239,12 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, fuzzy, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2260,7 +2254,7 @@ msgstr ""
 "%d)\n"
 "      --no-hash               дваічны файл не зьм�шчае х�ш табліцы\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2269,7 +2263,7 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, fuzzy, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2279,85 +2273,85 @@ msgstr ""
 "%d)\n"
 "      --no-hash               дваічны файл не зьм�шчае х�ш табліцы\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "увага: загаловак PO-файла прапушчан ці нер�чаі�ны\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "увага: пераўтвар�ньне кадзіровак не будзе працаваць\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "даменна� назва \"%s\" не падыходзіць у �ка�ці назвы файла"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "даменна� назва \"%s\" не падыходзіць у �ка�ці назвы файла;\n"
 "будзе выкары�таны пр�фік�"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "дыр�ктыва `domain %s' ігнаруецца"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "парожн�е уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: увага: ізыходны файл зм�шчае недакладны пераклад"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "памылка ў ча� чытаньн� \"%s\""
@@ -2546,12 +2540,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Белару�кі пераклад дл� %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "уваходз�чы файл зьм�шчае два розных набора �імвалаў \"%s\" і \"%s\""
@@ -2573,14 +2567,14 @@ msgstr ""
 "уваходз�чы файл `%s' не зьм�шчае загаловачны запі�\n"
 "�а �ьпецыфікацыей кодавай �таронкі"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "увага: "
@@ -2649,25 +2643,25 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "выраз множнага ліку можа ўтвараць адмоўнае знач�ньне"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu але выраз множнага ліку можа ўтвараць знач�ньні такі� �к %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "выраз множнага ліку можа ўтвараць дз�леньне на нуль"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "выраз множнага ліку можа ўтвараць ц�лалікавае перапаўненьне"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2675,40 +2669,40 @@ msgstr ""
 "выраз множнага ліку можа ўтвараць арыфм�тычны� выключ�ньні, магчыма\n"
 "дз�леньне на нуль"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Па�прабуйце выкары�тоўваць на�тупнае, р�чаі�нае дл� %s\n"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "каталёг паведамленьн� мае пераклады форм множнага ліку..."
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫР�З\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "нер�чаі�нае знач�ньне nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "нер�чаі�ны выраз формы мнножнага ліку (plural)"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2717,7 +2711,7 @@ msgstr[1] "...але некаторы� паведамленьні маюць т
 msgstr[2] ""
 "...але некаторы� паведамленьні маюць толькі %lu формаў множнага ліку"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2725,113 +2719,118 @@ msgstr[0] "...але некаторы� паведамленьні маюць %l
 msgstr[1] "...але некаторы� паведамленьні маюць %lu формы множнага ліку"
 msgstr[2] "...але некаторы� паведамленьні маюць %lu формаў множнага ліку"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "апрацоўка множнага ліку - г�та пашыр�ньне GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "некаторы� палі загалока ў�ё �шч� маюць пачатковае знач�ньне\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "памылка ў ча� чытаньн� файла \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "уваходз�чы файл не зм�шчае загаловачнага запі�у аб наборы �імвалаў"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3223,7 +3222,7 @@ msgstr "Ñ�імвал канца радка знаходзіцца ўнутры Ñ
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "г�ты файл можа не зм�шчаць дыр�ктыў дамену"
@@ -3245,32 +3244,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "прапушчана назва фільтра"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "нер�чаі�нае знач�ньне nplurals"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файл \"%s\" абр�зан"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файл \"%s\" зм�шчае радок не завершаны нулём"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "фармат файла \"%s\" не GNU .mo"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файл \"%s\" зьм�шчае радок не завершаны нулём, л� %s"
@@ -3442,25 +3441,25 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr "памылка ўзаемадзе�ньн� з падпрац��ам %s"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "памылка ў ча� адкрыцц� \"%s\" дл� запі�у"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "нер�чаі�на� назва Java-кла�а: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "памылка кампіл�цыі Java кл��а, калі ла�ка па�прабуйце --verbose,\n"
 "ці ў�тал�ваць пераменную а��роддз� $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3557,12 +3556,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: увага: незавершаны радок"
@@ -3582,7 +3581,7 @@ msgstr "%s:%d: увага: незавершанаÑ� Ñ�імвальнаÑ� канÑ
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3614,7 +3613,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "памылка iconv"
@@ -3626,7 +3625,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: увага: незавершана� �імвальна� кан�танта"
@@ -3646,76 +3645,76 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "нев�дома� мова `%s'"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--joun-existing не можа быць выкара�таны пры запі�ы ў stdout"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не можа працаваць без ключавых �лоў дл� пошуку"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "увага: файл \"%s\" �уфік� \"%s\" нев�домы; па�прабуйце C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "�трымлівае перакладаемы� радкі з дадзеных уваходз�чых файлаў.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "невызначан уваходз�чы файл"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3728,41 +3727,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3772,15 +3771,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3788,17 +3787,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3808,7 +3807,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3818,7 +3817,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3826,7 +3825,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3836,85 +3835,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3922,7 +3926,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3930,52 +3934,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "�тандартны ўвод"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: увага: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3984,7 +3988,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3994,27 +3998,27 @@ msgstr ""
 "gettext(\"\") в�ртае загаловак зь\n"
 "метададзенымі, а н� пу�ты радок.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неадназначны аргум�нт `%s' дл� `%s'"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4022,7 +4026,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "нев�дома� мова `%s'"
@@ -4121,13 +4125,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4135,7 +4139,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4143,7 +4147,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4151,7 +4155,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4159,7 +4163,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4167,22 +4171,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: нер�чаі�нае вызнач�ньне радка"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: прапушчан нумар па�ьл� #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: нер�чаі�ны выраз-радок"
@@ -4327,14 +4331,6 @@ msgstr ""
 msgid "document ended unexpectedly: %s"
 msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Language \"glade\" is not supported. %s relies on expat.\n"
-#~ "This version was built without expat.\n"
-#~ msgstr ""
-#~ "Кадзіроўка \"%s\" не падтрымліваецца. %s �падз�ецца на iconv().\n"
-#~ "Г�та в�р�і� пабудавана без iconv().\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: не�апраўдны выбар -- %c\n"
 
diff --git a/gettext-tools/po/bg.gmo b/gettext-tools/po/bg.gmo
index 4109fa7..4e0488b 100644
--- a/gettext-tools/po/bg.gmo
+++ b/gettext-tools/po/bg.gmo
diff --git a/gettext-tools/po/bg.po b/gettext-tools/po/bg.po
index 84c8d8f..2a08b97 100644
--- a/gettext-tools/po/bg.po
+++ b/gettext-tools/po/bg.po
@@ -1,14 +1,14 @@
 # Bulgarian translations for gettext-tools package.
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2012,2014,2015.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010,2012,2014,2015,2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.7-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-23 14:39+0200\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-02 23:19+0300\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
 "Language: bg\n"
@@ -109,7 +109,7 @@ msgid "Unknown system error"
 msgstr "�еизве�тна �и�темна грешка"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -187,15 +187,15 @@ msgstr "неправилен аргумент за \"верÑ�иÑ� на изтоÑ
 msgid "invalid target_version argument to compile_java_class"
 msgstr "неправилен аргумент за \"вер�и� на резултат\" за compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "пропадна �ъздаването на \"%s\""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -222,39 +222,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s В/И грешка при подпроце�"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "паметта е изчерпана"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "пропадна �ъздаването на кла� нишки(threads)"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "пропадна запи�ването към подпроце� %s "
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "пропадна четенето от подпроце� %s "
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "не може да �е зададе неблокиран В/И към подпроце� %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "пропадна връзката � подпроце� %s"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "подпроце�ът %s приключи � код за изход %d"
@@ -293,18 +293,18 @@ msgstr "“"
 msgid "setting permissions for %s"
 msgstr "задаване на права върху %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "не можа да �е �ъздаде канал"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle пропадна"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "не можа да �е въз�танови опи�анието на файл %d, dup2 пропадна"
@@ -336,11 +336,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "За елемента <%s> лип�ва признак <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "За повече �ведени�, опитайте '%s --help'.\n"
@@ -365,7 +365,7 @@ msgstr ""
 "мн.ч. за ЕЗИК и �е извеждат по начин подход�щ за употреба от gettext.\n"
 "�ко не е заден аргумент, то CLDR правилата за мн.ч. �е четат от �тандартни� вход.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -382,21 +382,21 @@ msgstr ""
 "CLDR формат\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  извеждане на тази помощ и изход\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               извеждане на �ведение за вер�и� и изход\n"
@@ -406,22 +406,22 @@ msgstr "  -V, --version               извеждане на Ñ�ведение Ð
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Подавайте доклади за грешки на <bug-gnu-gettext@gnu.org>,\n"
 "а за грешки в превода на <dict@fsa-bg.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -435,10 +435,10 @@ msgstr ""
 "�е �е дават �ИК�КВИ Г�Р��ЦИИ до �тепента позволена от закона.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Създадена от %s.\n"
@@ -469,37 +469,37 @@ msgid "extra operand %s"
 msgstr "допълнителен аргумент %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "грешка при отвар�не за четене на \"%s\""
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "указани�т формат за аргумент %u, както е в '%s', не �ъще�твува за '%s'"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "указани�т формат за аргумент %u не �ъще�твува за '%s'"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -535,8 +535,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "�изът указва към аргумент номер %u, но пренебрегва аргумент номер  %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "не �ъвпада указани� брой на формати при '%s' и при '%s'"
@@ -849,8 +848,8 @@ msgstr "не Ñ�а равноÑ�тойни указаните формати прÐ
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "указаните формати при '%s' не �а подмноже�тво на тези при '%s'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "указани�т формат за аргумент '%s' не �ъще�твува при '%s'"
@@ -867,17 +866,17 @@ msgstr "При директива номер %u, размерът не е �ъв
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "При директива номер %u, � '%c' не може да �е започне име на поле."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "При директива номер %u, � '%c' не може да �е започне getattr аргумент."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "При директива номер %u, � '%c' не може да �е започне getitem аргумент."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -885,12 +884,12 @@ msgstr ""
 "При директива номер %u, не �а разререни повече влагани� при указание за "
 "формат."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "При директива номер %u, не е завършено указанието за форматиране."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -898,12 +897,12 @@ msgstr ""
 "�изът указва към аргументи и чрез име на аргумент, и чрез безименно указване "
 "на аргументи."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "�изът указва към аргумент � име '%s' по не�ъвме�тими начини."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -911,7 +910,7 @@ msgstr ""
 "указаните формати при '%s' очакват изобраз�ване, а тази при '%s' очакват "
 "по�ледователно�т"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -919,14 +918,14 @@ msgstr ""
 "указаните формати при '%s' очакват по�ледователно�т, а тази при '%s' очакват "
 "изобраз�ване"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "указани�т формат за аргумент '%s', като при '%s', не �ъще�твува при '%s'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -980,7 +979,7 @@ msgid ""
 msgstr "Знакът, който прекрат�ва директива номер %u, не е чи�ло между 1 и 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1028,11 +1027,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адре�и за мрежово име\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "О�ведомително извеждане:\n"
@@ -1104,12 +1103,12 @@ msgstr "главни� елемент не е правило за ме�топо
 msgid "at most one input file allowed"
 msgstr "позвол�ва �е най-много един вход�щ файл"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s �а взаимоизключващи �е"
@@ -1128,7 +1127,7 @@ msgstr ""
 "Прецежда �ъобщени�та от каталога � преводи �поред техните атрибути и \n"
 "обработва атрибутите.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1139,10 +1138,10 @@ msgstr ""
 "Задължителни аргументи за \"дълги\" опции �а �ъщо задължителни за \"къ�и\" "
 "опции.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Ме�тоположение на вход�щ файл:\n"
@@ -1152,10 +1151,10 @@ msgstr "Ме�тоположение на вход�щ файл:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ВХФ�ЙЛ                      вход�щ PO файл\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1171,24 +1170,24 @@ msgstr ""
 "�ко не е зададено име на вход�щ файл или то е -, ще �е чете от �тандартни� "
 "вход.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Ме�тоположение на резултатата:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=Ф�ЙЛ      запи�ване на резултата в зададени� файл\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1199,7 +1198,7 @@ msgstr ""
 "Резултатите �е извеждат на �тандартни� изход, ако не е зададен файл за запи� "
 "или той е -\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Избор на �ъобщени�:\n"
@@ -1331,9 +1330,9 @@ msgid ""
 msgstr ""
 "      --obsolete              �иноним за --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1358,17 +1357,17 @@ msgstr ""
 "      --stringtable-input     вход�щи� файл е �ъ� �интак�и� на NeXTstep/"
 "GNUstep .низове\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробно�ти за извеждане:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1383,16 +1382,16 @@ msgstr ""
 "                              КОГ� може да бъде 'always', 'never', 'auto', "
 "или 'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=СТИЛФ�ЙЛ        задава CSS правила за --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1400,9 +1399,9 @@ msgstr ""
 "  -e, --no-escape             без използване на Си о�вобождаващи "
 "по�ледователно�ти в резултата (по подразбиране)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1410,30 +1409,30 @@ msgstr ""
 "  -E, --escape                използване на Си о�вобождаващи "
 "по�ледователно�ти в резултата, без разширени знаци\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              запи�ване на PO файл, дори ако е празен\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                запи�ване на .po файл в �тил � отме�твани�\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           без запи�ване на редове '#: filename:line'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1441,8 +1440,8 @@ msgstr ""
 "  -n, --add-location          �ъздаване на редове '#: filename:line' (по "
 "подразбиране)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1450,34 +1449,34 @@ msgstr ""
 "      --strict                запи�ва �трого отговар�щ за уеднакв�ване .po "
 "файл\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     запи�ване на Java .properties файл\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    запи�ване на NeXTstep/GNUstep .strings файл\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 "  -w, --width=ЦЯЛО            у�танов�ване на ширината на изход�щата "
 "�траница\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1486,32 +1485,32 @@ msgstr ""
 "      --no-wrap               без раздел�не на н�колко реда на �ъобщени�,\n"
 "                              по-дълги от ширината на изход�щата �траница\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           резултатът да е подреден\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          подреждане на резултата по м��то на файла\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "избран е невъзможен критерии за избор (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Употреба: %s [ОПЦИЯ] [ВХФ�ЙЛ]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1534,25 +1533,25 @@ msgstr ""
 "ще �е натрупат, о�вен ако е зададено --use-first, като тогава ще �е вземат\n"
 "от първи� PO файл, който ги определ�.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХФ�ЙЛ ...                  вход�щи файлове\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=Ф�ЙЛ       получаване на �пи�ъка � вход�щи файлове от "
 "Ф�ЙЛ\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "�ко вход�щи� файл е -, �е чете от �тандартни� вход.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1563,7 +1562,7 @@ msgstr ""
 "                              По-поразбиране безкрайно�т, ако не е "
 "у�тановено\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1573,7 +1572,7 @@ msgstr ""
 "това\n"
 "                              По-поразбиране 0, ако не е у�тановено\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1582,7 +1581,7 @@ msgstr ""
 "  -u, --unique                �ъкращени� за --less-than=2, пои�ква �е\n"
 "                              извеждане на неповтар�щите �е �ъобщени�\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1591,7 +1590,7 @@ msgstr ""
 "  -P, --properties-input      вход�щите файлове �а � Java .properties "
 "�интак�и�\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1602,12 +1601,12 @@ msgstr ""
 "strings\n"
 "                              �интак�и�\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ИМЕ           кодировка при извеждане\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1616,7 +1615,7 @@ msgstr ""
 "      --use-first             използване на първи� наличен превод за в��ко\n"
 "                              �ъобщение, без �ливане на отделни преводи\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1624,7 +1623,7 @@ msgstr ""
 "      --lang=ИМЕК�Т�ЛОГ       задава поле 'Language' за заглавни� блок\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Петер Милер"
 
@@ -1729,19 +1728,19 @@ msgstr "Ñ�ъобщението Ñ�е използва, но не е опредеÐ
 msgid "warning: this message is not used"
 msgstr "предупреждение: �ъобщението не �е използва"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "открита е %d пагубна грешка"
 msgstr[1] "открити �а %d пагубни грешки"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "най-малко два реда тр�бва да �е зададат"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1762,7 +1761,7 @@ msgstr ""
 "първи� PO файл, който ги определ�.  От в�ички PO файлове ще �е натрупат\n"
 "ме�тоположени�та във файловете.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1772,7 +1771,7 @@ msgstr ""
 "това\n"
 "                              По-поразбиране 1, ако не е у�тановено\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1821,7 +1820,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                �трог уеднаквен �тил за резултат\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "не е зададен вход�щ файл"
@@ -2008,119 +2007,119 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "прецедени�т изход не завършва � знак за нов ред"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумента на %s тр�бва да е единичен препинателен знак"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неправилно име за начин на подреждане на байтове: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "не �а задава вход�щ файл, ако �а зададени %s и %s"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s изи�ква указване на \"-d директори�\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s изи�ква указване на \"-l локал\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s изи�ква указване на \"\"--template пример\""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s изи�ква указване на \"-o файл\""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s и %s �а взаимоизключващи �е при %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s е правилен �амо � %s или %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s е правилен �амо � %s, %s или %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "за %s не �а открити правила за превод"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d преведено �ъобщение"
 msgstr[1] "%d преведени �ъобщени�"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d мъгл�в превод"
 msgstr[1] ", %d мъгл�ви преводи"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d непреведено �ъобщение"
 msgstr[1] ", %d непреведени �ъобщени�"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Употреба: %s [ОПЦИЯ] имефайл.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Създаване на двоичен каталог �ъ� �ъобщени� от тек�тово опи�ание на "
 "преводите.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  имефайл.po ...              вход�щи файлове\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режими на работа:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2129,7 +2128,7 @@ msgstr ""
 "  -j, --java                  Java режим: �ъздаване на кла� за Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2138,12 +2137,12 @@ msgstr ""
 "      --java2                 като --java и �е подразбира Java2 (JDK 1.2 или "
 "по-нова)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# режим: �ъздаване на .NET .dll файл\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2152,19 +2151,19 @@ msgstr ""
 "      --csharp-resources      C# ре�ур� режим: �ъздаване на .NET .resources "
 "файл\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl режим: �ъздаване на tcl/msgcat .msg файл\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt режим: �ъздаване на Qt .qm файл\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2172,33 +2171,33 @@ msgstr ""
 "      --desktop               Режим \"Работен плот\": �ъздаване на .desktop "
 "файл\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   XML режим: �ъздаване на XML файл\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                разрешава �триктен уеднаквен режим\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "�ко изход�щи� файл е -, резултатът �е запи�ва на �тандартни� изход.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Ме�тоположение на резултата при Java режим:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       име на ре�ур�\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2206,21 +2205,21 @@ msgid ""
 msgstr ""
 "  -l, --locale=ЛОК�Л          име на локал, или език, или език_ДЪРЖ�В�\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr "      --source                �ъздава .java файл, вме�то .class файл\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d ДИРЕКТОРИЯ               о�новна директори� � йерархи�та на кла�овете\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2233,12 +2232,12 @@ msgstr ""
 "разделени � долна черта.  Опци�та -d е задължителна.  Кла�ът �е запи�ва в\n"
 "зададената директори�.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Ме�тоположение на резултата при C# режим:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2247,7 +2246,7 @@ msgstr ""
 "  -d ДИРЕКТОРИЯ               о�новна директори� за зави�ими от локал .dll "
 "файлове\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2256,19 +2255,19 @@ msgstr ""
 "Опциите -l и -d �а задължителни.  .dll файла �е запи�ва в поддиректори�\n"
 "на указаната, чието име зави�и от локала.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Ме�тоположение на резултата при Tcl режим:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d ДИРЕКТОРИЯ               о�новна директори� за каталози � .msg "
 "�ъобщени�\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2277,22 +2276,22 @@ msgstr ""
 "Опциите -l и -d �а задължителни.  .msg файла �е запи�ва в указаната\n"
 "директори�.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Опции за режим \"Работен плот\":\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=ПРИМЕР           .desktop-файл използван като пример\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d ДИРЕКТОРИЯ               о�новна директори� от .po-фаилове\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2301,7 +2300,7 @@ msgstr ""
 "  -kДУМ�, --keyword=ДУМ�      тър�ене по ДУМ� като допълнителен ключ\n"
 "  -k, --keyword               да не �е използва ключ по подразбиране\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2312,27 +2311,27 @@ msgstr ""
 "вход�щите\n"
 "файлове �е четат от тази директори�, вме�то от командни� ред.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Опции за XML режим:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=ЕЗИК         прилагане на зададени� XML език\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=ПРИМЕР           XML-файл използван като пример\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Тълкувани� за вход�щи� файл:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2344,14 +2343,14 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          проверка на езиково зави�имите форматиращи "
 "низове\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2360,7 +2359,7 @@ msgstr ""
 "      --check-header          проверка на наличието и �ъдържанието на "
 "заглавни запи�и\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2370,7 +2369,7 @@ msgstr ""
 "обла�т\n"
 "                                и опци�та --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2379,7 +2378,7 @@ msgstr ""
 "  -C, --check-compatibility   проверка дали Г�У msgfmt �е държи като X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2390,14 +2389,14 @@ msgstr ""
 "клавиши\n"
 "                                за елементи на меню\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             използване на мъгл�ви(fuzzy) запи�и при "
 "извеждане\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2405,7 +2404,7 @@ msgstr ""
 "  -a, --alignment=БРОЙ        подравн�ва низовете до БРОЙ байтове (по "
 "подразбиране: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2418,92 +2417,92 @@ msgstr ""
 "                                (�тарши или младши, по подразбиране зави�и "
 "от проце�ора)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               двоични�т файл н�ма да �ъдържа хеш-таблица\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            извежда �тати�тика за преводите\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               увеличава нивото на подробно�т\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "предупреждение: заглавието на PO файла лип�ва или не е правилно\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "предупреждение: н�ма да работи превръщането м/у кодировки\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "предупреждение: заглавието на PO файла е мъгл�во\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "предупреждение: �тари вер�ии на msgfmt ще дадат грешка за това\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "името на обла�т \"%s\" не е подход�що за име на файл"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "името на обла�т  \"%s\" не е подход�що за име на файл: ще �е използва "
 "пред�тавка"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "пренебрегната директива 'обла�т %s'"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "пренебрегнат празен 'msgstr' запи�"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "пренебрегнат мъгл�в(fuzzy) 'msgstr' запи�"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: предупреждение: файла източник �ъдържа мъгл�ви преводи"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s не �ъще�твува"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s �ъще�твува, но е нечетим"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при четене на \"%s\""
@@ -2749,12 +2748,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Българ�ки превод за пакет %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "текущата кодировка, \"%s\", не е � прено�имо име"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "вход�щи� файл е � две различни кодировки - \"%s\" и \"%s\""
@@ -2774,14 +2773,14 @@ msgstr ""
 "обла�тта \"%s\", във вход�щи� файл '%s', не �ъдържа заглавен запи� за "
 "указаване на кодировка"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "целевата кодировка, \"%s\", не е � прено�имо име"
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
@@ -2876,26 +2875,26 @@ msgstr ""
 "Резултата от '%s' може да не е правилен.\n"
 "Възможно заобикал�не е да �е у�танови LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "израза за множе�твено чи�ло може да върне отрицателна �тойно�т"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, но израза за множе�твено чи�ло може да върне �тойно�т по-"
 "гол�ма от %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "в израза за множе�твено чи�ло може да получи деление на нула"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "в израза за множе�твено чи�ло може да получи целочи�лено препълване"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2903,51 +2902,51 @@ msgstr ""
 "в израза за множе�твено чи�ло може да �е получи аритметична грешка, възможно "
 "е деление на нула"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Да �е опита �ледното, правилно за  %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "каталогът �ъ� �ъобщени�та �ъдържа преводи за множе�твено чи�ло"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "но в заглавни� блок лип�ва запи� \"plural=ИЗР�З\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "но в заглавни� блок лип�ва запи� \"nplurals=ЦЯЛО\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "неправилна �тойно�т за nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "неправилен израз за множе�твено чи�ло"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "но н�кой �ъобщени� �ъдържат �амо една форма за множе�твено чи�ло"
 msgstr[1] "но н�кой �ъобщени� �ъдържат �амо %lu форми за множе�твено чи�ло"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "но н�кой �ъобщени� �ъдържат една форма за множе�твено чи�ло"
 msgstr[1] "но н�кой �ъобщени� �ъдържат %lu форми за множе�твено чи�ло"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2955,89 +2954,94 @@ msgstr ""
 "каталогът �ъ� �ъобщени� �ъдържа форми за множе�твено чи�ло, но лип�ва "
 "заглавен запи� � \"Plural-Forms: nplurals=ЦЯЛО; plural=ИЗР�З;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "и двата запи�а, 'msgid' и 'msgid_plural', не започват � '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "и двата запи�а, 'msgid' и 'msgstr[%u]', не започват � '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "и двата запи�а, 'msgid' и '`msgstr', не започват � '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "и двата запи�а, 'msgid' и 'msgid_plural', не завършват � '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "и двата запи�а, 'msgid' и 'msgstr[%u]', не завършват � '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "и двата запи�а, 'msgid' и 'msgstr', не завършват � '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "поддръжката на множе�твено чи�ло е допълнение на Г�У gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr е без отбел�зване за у�корена клавишна комбинаци� '%c'"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr е отбел�зан � твърде много отметки за клавишни комбинации '%c'"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "в�е още заглавното поле '%s' е � началната �тойно�т по подразбиране\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "в заглавни� блок лип�ва поле '%s'\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "ASCII многоточие ('...') вме�то уникод"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 "във видим за потребителите низ е намерено знак за празно преди многоточието"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "използвана е двойна кавичка в ASCII вме�то в уникод"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "използвана е единична кавичка в ASCII вме�то в уникод"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII отметка ('%c') вме�то уникод"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: вход�щите данни не �а � кодировка \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: грешка при преобразуване от кодировка \"%s\" към кодировка \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "вход�щи� файл не �ъдържа запи� указващ кодировка"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3046,7 +3050,7 @@ msgstr ""
 "�е може да �е превърне от \"%s\" към \"%s\". %s използва iconv(), а iconv() "
 "не поддържа това превръщане."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3055,8 +3059,8 @@ msgstr ""
 "Превръщането от \"%s\" към \"%s\" �ъздаде повторени�: н�кой различни msgids "
 "�е получиха еднакви."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3494,7 +3498,7 @@ msgstr "край-на-ред в низ"
 msgid "context separator <EOT> within string"
 msgstr "разделител на �ъдържание <EOT> в низ"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "този файл май не �ъдържа директиви за обла�т"
@@ -3515,31 +3519,31 @@ msgstr "незавършено име на група"
 msgid "invalid non-blank character"
 msgstr "неправилен значещ знак"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "лип�ва '=' �лед \"%s\""
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "неправилна значеща лини�"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файлът \"%s\" е отр�зан"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файлът \"%s\" �ъдържа низ не завършващ на NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "файла \"%s\" не е в Г�У .mo формат"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файла \"%s\" �ъдържа незавършващ � NUL низ на позици� %s"
@@ -3720,25 +3724,25 @@ msgstr "пропадна компилирането на кла� на C#, да
 msgid "compilation of C# class failed"
 msgstr "пропадна компилирането на кла� на C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "грешка при отвар�не на \"%s\" за запи�"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "неправилно име за кла� на Java: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "пропадна компилирането на кла� на Java, да �е опита --verbose или да �е "
 "у�танови $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3849,12 +3853,12 @@ msgstr ""
 "каталогът �ъ� �ъобщени�та �ъдържа преводи в множе�твено чи�ло,\n"
 "но те не �е поддържат от Tcl каталог �ъ� �ъобщени�\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: предупреждение: незавършен низ"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: предупреждение: незавършен регул�рен израз"
@@ -3874,7 +3878,7 @@ msgstr "%s:%d: предупреждение: незавършена кон�та
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: предупреждение: незавършен заме�тител на низ"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Да �е зададе кодировка на източника чрез --from-code."
 
@@ -3914,7 +3918,7 @@ msgstr ""
 "%s:%d: �епълна многобайтова по�ледователно�т в кра� на реда.\n"
 "Да �е зададе правилна кодировка на източника чрез --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: неу�пех на iconv"
@@ -3928,7 +3932,7 @@ msgstr ""
 "%s:%d: �еправилна многобайтова по�ледователно�т.\n"
 "Да �е зададе кодировка на източника чрез --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: предупреждение: неправилен знак на уникод"
@@ -3948,40 +3952,40 @@ msgstr "%s:%d: предупреждение: намерено е ')', къдет
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: предупреждение: намерено е '}', където �е очаква ')'"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 "'%s' не е правилно име на кодировка.  Използване на ASCII по подразбиране.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "непозната проверка '%s' на �интак�и�"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "непознат край '%s' на изречение"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing не може да �е използва, когато резултата �е запи�ва на "
 "�тандартни� изход"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може да работи без ключове за тър�ене"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "предупреждение: не �ъще�твува ITS-файл � правила - '%s'"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -3989,18 +3993,18 @@ msgstr ""
 "предупреждение: не �ъще�твува ITS-файл � правила - '%s', проверете "
 "разполагането на gettext"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "предупреждение: файлът '%s' � окончание '%s' е непознат, ще �е опита Си"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извличане на низовете за превод от зададените вход�щи файлове.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4009,13 +4013,13 @@ msgstr ""
 "  -d, --default-domain=ИМЕ   използване на ИМЕ.po за изход�щ (вме�то "
 "messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=Ф�ЙЛ           запи�ване на изходните данни в указани� файл\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4023,12 +4027,12 @@ msgstr ""
 "  -p, --output-dir=ДИР        изход�щите файлове да �е запишат в директори� "
 "ДИР\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избиране на език на вход�щи� файл:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4049,12 +4053,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua)\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   за кратко�т на --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4063,7 +4067,7 @@ msgstr ""
 "По подразбиране езикът �е отгатва в зави�имо�т от окончанието на вход�щи� "
 "файл.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4072,23 +4076,23 @@ msgstr ""
 "      --from-code=NAME        кодиране на вход�щите файлове\n"
 "                                (без Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "По подразбиране вход�щите файлове �а в ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         добав� �ъобщени�та към �ъще�твуващ файл\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=Ф�ЙЛ.po  да не �е извличат запи�ите от FILE.po\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4102,18 +4106,18 @@ msgstr ""
 "  -c, --add-comments            в резултата �е по�тав�т в�ички блокове �\n"
 "                                коментар от редовете преди ключа\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=ИМЕ             извършва �интактична проверка на �ъобщени�та\n"
 "                                (многоточие-уникод, празно-многоточие,\n"
-"                                 кавичка-уникод)\n"
+"                                 кавичка-уникод, отметка-уникод)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4125,17 +4129,17 @@ msgstr ""
 "�е, \n"
 "                                 или друкратно празно)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Опции за определен език:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           извличане на в�ички низове\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4150,7 +4154,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4165,7 +4169,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4175,7 +4179,7 @@ msgstr ""
 "      --flag=ДУМ�:�РГ:ФЛ�Г    допълнителен флаг за низове при номер на\n"
 "                              аргумент �РГ за ключ ДУМ�\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4190,39 +4194,49 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             разпознаване на ANSI Си тризнаци в входните "
 "данни\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (�амо езици C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=Ф�ЙЛ              прилагане на ITS-правила от Ф�ЙЛ\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (�амо езици въз о�нова на XML)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    разпознава Qt формат за низове\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (�амо език C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   разпознава KDE 4 формат за низове\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 разпознава Boost формат за низове\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4230,29 +4244,24 @@ msgstr ""
 "      --debug                 по-подробен резултат как е разпознато "
 "�ъобщението като вид формат\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     запи�ва Java .properties файл\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=Ф�ЙЛ              прилагане на ITS-правила от Ф�ЙЛ\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               запи�ване на itstool бележки\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=�ИЗ     задава но�ител на автор�ко право в "
 "резултата\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4260,17 +4269,17 @@ msgstr ""
 "      --foreign-user          резултат без автор�ко право на ФСС за\n"
 "                              чужде�транни потребители\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=П�КЕТ    задава име на пакет в резултата\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=ВЕРСИЯ   задава вер�и� на пакета в резултата\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4278,7 +4287,7 @@ msgstr ""
 "      --msgid-bugs-address=ПОЩ�@�ДРЕС     задава адре� за рапортуване на "
 "грешки при msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4289,7 +4298,7 @@ msgstr ""
 "пред�тавка за\n"
 "                                �тойно�тите на msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4300,38 +4309,38 @@ msgstr ""
 "за\n"
 "                                �тойно�ти на msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr "�ргумента --flag не е � <ключ>:<ном_арг>:[pass-]<флаг> �интак�и�: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "�тандартен изход"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Знак извън ASCII кодиране при %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Коментар, който е извън ASCII кодиране, при или преди %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "�из извън ASCII кодиране при %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: предупреждение: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4340,7 +4349,7 @@ msgstr ""
 "Макар че е използван в м��то за низове за формат, %s не е правилен низ за %s "
 "формат. Причина: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4349,7 +4358,7 @@ msgstr ""
 "Макар че е об�вен като такъв, %s не е правилен низ за %s формат. Причина: "
 "%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4362,7 +4371,7 @@ msgstr ""
 "Да �е обми�ли използването на низ за формат � именувани аргументи и \n"
 "привързване, вме�то по�ледователно�т за аргументите.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4372,27 +4381,27 @@ msgstr ""
 "gettext(\"\") връща заглавен запи� � метаинформаци�,\n"
 "а не празен низ.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "дву�ми�лено зададен аргумент за ключ '%.*s'"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "предупреждение: лип�ва �ъдържание за ключ '%.*s'"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "предупреждение: лип�ва �ъдържание за множе�твено чи�ло на ключ '%.*s'"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "�е�ъответ�твие на �ъдържание м/у един�твено и множе�твено чи�ло"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4404,7 +4413,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS променлива, иначе �е задава\n"
 ", на командни� ред, опци� --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "непознат език '%s'"
@@ -4515,7 +4524,7 @@ msgstr "%s:%d: неправилно вмъкване (\"\\L\") на 8-битов
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неправилно вмъкване (\"\\U\") на 8-битова буква \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4523,7 +4532,7 @@ msgstr ""
 "Да �е зададе кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4534,7 +4543,7 @@ msgstr ""
 "Да �е зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4545,7 +4554,7 @@ msgstr ""
 "Да �е зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4556,7 +4565,7 @@ msgstr ""
 "Да �е зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4567,7 +4576,7 @@ msgstr ""
 "Да �е зададе правилното кодиране на източника чрез --from-code или чрез\n"
 "коментар, като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4578,22 +4587,22 @@ msgstr ""
 "Да �е зададе кодиране на източника чрез --from-code или чрез коментар,\n"
 "като е указано в http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "�еизве�тно кодиране \"%s\". Продължаване на работата � ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неправилен определение за низ"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: лип�ва чи�ло �лед #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неправилен израз от тип низ"
diff --git a/gettext-tools/po/ca.gmo b/gettext-tools/po/ca.gmo
index 00105ff..bbe35b2 100644
--- a/gettext-tools/po/ca.gmo
+++ b/gettext-tools/po/ca.gmo
diff --git a/gettext-tools/po/ca.po b/gettext-tools/po/ca.po
index 8e79555..f0b26a2 100644
--- a/gettext-tools/po/ca.po
+++ b/gettext-tools/po/ca.po
@@ -52,7 +52,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-25 19:19+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -167,7 +167,7 @@ msgid "Unknown system error"
 msgstr "Error desconegut del sistema"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -245,15 +245,15 @@ msgstr "l’argument «source_version» passat a compile_java_class() no és và
 msgid "invalid target_version argument to compile_java_class"
 msgstr "l’argument «target_version» passat a compile_java_class() no és vàlid"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "no s’ha pogut crear «%s»"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -280,39 +280,39 @@ msgid "%s subprocess I/O error"
 msgstr "error d’E/S amb el subprocés «%s»"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "la memòria s’ha exhaurit"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "la creació de fils ha fallat"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "no s’ha pogut escriure al subprocés «%s»"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "no s’ha pogut llegir del subprocés «%s»"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "no s’ha pogut establir una E/S no blocadora amb el subprocés «%s»"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "la comunicació amb el subprocés «%s» ha fallat"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "el subprocés «%s» ha terminat amb codi d’eixida %d"
@@ -352,18 +352,18 @@ msgstr "»"
 msgid "setting permissions for %s"
 msgstr "en establir els permissos de %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "no s’ha pogut crear una canonada"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "ha fallat _open_osfhandle()"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "no s’ha pogut restaurar el descriptor %d: ha fallat dup2()"
@@ -395,11 +395,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Proveu «%s --help» per a obtenir més informació.\n"
@@ -419,7 +419,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -434,21 +434,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help           Mostra aquesta ajuda i ix.\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help           Mostra aquesta ajuda i ix.\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
@@ -458,20 +458,20 @@ msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -485,10 +485,10 @@ msgstr ""
 "No hi ha CAP GARANTIA, en la mesura que ho permeta la llei.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
@@ -521,18 +521,18 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error en obrir «%s» per a llegir"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -541,19 +541,19 @@ msgstr ""
 "en «%3$s»"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "no existeix una especificació de format de l’argument %u en «%s»"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -600,8 +600,7 @@ msgstr ""
 "número %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "el nombre d’especificacions de format en «%s» i «%s» no coincideix"
@@ -938,8 +937,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "les especificacions de format de «%s» no són un subconjunt de les de «%s»"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "no existeix una especificació de format de l’argument «%s» en «%s»"
@@ -958,19 +957,19 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "A la directiva número %u, «%c» no pot començar un nom de camp."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "A la directiva número %u, «%c» no pot començar un argument per a «getattr()»."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 "A la directiva número %u, «%c» no pot començar un argument per a «getitem()»."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -978,13 +977,13 @@ msgstr ""
 "A la directiva número %u, no s’admet més niament en l’especificació de "
 "format."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 "A la directiva número %u, hi ha una directiva de format sense terminar."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -992,13 +991,13 @@ msgstr ""
 "La subcadena es refereix a arguments tant pel seu nom com per "
 "especificacions d’argument sense nom."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "La cadena es refereix a l’argument anomenat «%s» de formes incompatibles."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -1006,7 +1005,7 @@ msgstr ""
 "les especificacions de format de «%s» necessiten un mapa, les de «%s» una "
 "tupla"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -1014,7 +1013,7 @@ msgstr ""
 "les especificacions de format de «%s» necessiten una tupla, les de «%s» un "
 "mapa"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -1022,7 +1021,7 @@ msgstr ""
 "no existeix, com en «%2$s», una especificació de format de l’argument «%1$s» "
 "en «%3$s»"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1079,7 +1078,7 @@ msgstr ""
 "El caràcter que termina la directiva número %u no és un dígit entre 1 i 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1126,11 +1125,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address     Adreces corresponents al nom d’estació.\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Eixida informativa:\n"
@@ -1204,12 +1203,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "es permet com a molt un fitxer d’entrada"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "«%s» i «%s» són mútuament excloents"
@@ -1228,7 +1227,7 @@ msgstr ""
 "Filtra els missatges d’un catàleg de traduccions segons els seus atributs, i\n"
 "manipula aquests atributs.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1239,10 +1238,10 @@ msgstr ""
 "Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
 "opcions curtes corresponents.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Ubicació del fitxer d’entrada:\n"
@@ -1252,10 +1251,10 @@ msgstr "Ubicació del fitxer d’entrada:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FITXER_ENTRADA       Fitxer PO d’entrada.\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1272,17 +1271,17 @@ msgstr ""
 "Si no s’especifica cap fitxer d’entrada, o si aquest és «-», es llegirà\n"
 "l’entrada estàndard.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Ubicació del fitxer d’eixida:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
@@ -1290,7 +1289,7 @@ msgstr ""
 "  -o, --output-file=FITXER\n"
 "                       Escriu l’eixida al fitxer especificat.\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1302,7 +1301,7 @@ msgstr ""
 "fitxer\n"
 "d’eixida, o si aquest és «-».\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selecció dels missatges:\n"
@@ -1425,9 +1424,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete       Equival a «--only-obsolete --clear-obsolete».\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1455,17 +1454,17 @@ msgstr ""
 "                       El fitxer d’entrada segueix la sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalls de l’eixida:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1480,18 +1479,18 @@ msgstr ""
 "«html»\n"
 "                       (sempre, mai, automàtic, HTML).\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=FITXER    Empra el fitxer indicat de full d’estil CSS per a\n"
 "                        «--color».\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1499,9 +1498,9 @@ msgstr ""
 "  -e, --no-escape      No empra seqüències d’escapada de C a l’eixida (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1509,27 +1508,27 @@ msgstr ""
 "  -E, --escape         Empra seqüències d’escapada de C a l’eixida, en lloc\n"
 "                       de caràcters estesos.\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po       Genera el fitxer PO encara que estiga buit.\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location    No escriu les línies «#: nom_fitxer:línia».\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1537,8 +1536,8 @@ msgstr ""
 "  -n, --add-location    Escriu les línies «#: nom_fitxer:línia» (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1546,7 +1545,7 @@ msgstr ""
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
@@ -1555,9 +1554,9 @@ msgstr ""
 "  -p, --properties-output\n"
 "                       Genera un fitxer amb sintaxi «.properties» de Java.\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1566,16 +1565,16 @@ msgstr ""
 "                       Genera un fitxer amb sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=AMPLADA    Estableix l’amplada de pàgina de l’eixida.\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1584,27 +1583,27 @@ msgstr ""
 "      --no-wrap        No parteix les línies de missatge més llargues que\n"
 "                       l’amplada de pàgina.\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output    Genera una eixida ordenada.\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file    Ordena les eixides per llurs ubicacions en fitxer.\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "s’ha especificat un criteri de selecció impossible (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]…\n"
@@ -1612,7 +1611,7 @@ msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]…\n"
 # ivb (2001/12/24)
 # ivb  Aquesta traducció no és completament literal però queda més clar.
 # ivb  Amb «commonality» vol dir «nombre de coincidències».
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1634,25 +1633,25 @@ msgstr ""
 "extrets i posicions de fitxer s’acumularan, a no ser que especifiqueu\n"
 "«--use-first», al qual cas es treuran del primer fitxer PO que els definesca.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FITXER_ENTRADA…      Fitxers d’entrada.\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FITXER\n"
 "                       Obté la llista de fitxers d’entrada del FITXER.\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Si el fitxer d’entrada és «-» es llegirà l’entrada estàndard.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1662,7 +1661,7 @@ msgstr ""
 "                       Escriu els missatges amb menys de NÚMERO definicions\n"
 "                       (per defecte infinites).\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1673,7 +1672,7 @@ msgstr ""
 "(per\n"
 "                       defecte 0).\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1683,7 +1682,7 @@ msgstr ""
 "s’escriguen\n"
 "                       els missatges únics.\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1694,7 +1693,7 @@ msgstr ""
 "properties»\n"
 "                       de Java.\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1706,12 +1705,12 @@ msgstr ""
 "de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOM    Codificació de l’eixida.\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1721,7 +1720,7 @@ msgstr ""
 "mescla\n"
 "                       diverses traduccions.\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1731,7 +1730,7 @@ msgstr ""
 "capçalera.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1841,14 +1840,14 @@ msgstr "aquest missatge s’empra però no s’ha definit en «%s»"
 msgid "warning: this message is not used"
 msgstr "avís: aquest missatge no s’empra"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "s’ha trobat %d error fatal"
 msgstr[1] "s’han trobat %d errors fatals"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "cal que especifiqueu almenys dos fitxers"
@@ -1856,7 +1855,7 @@ msgstr "cal que especifiqueu almenys dos fitxers"
 # ivb (2001/12/24)
 # ivb  Aquesta traducció no és completament literal però queda més clar.
 # ivb  Amb «commonality» vol dir «nombre de coincidències».
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1877,7 +1876,7 @@ msgstr ""
 "que els definesca.  Les posicions de fitxer de tots els fitxers PO\n"
 "s’acumularan.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1888,7 +1887,7 @@ msgstr ""
 "(per\n"
 "                       defecte 1).\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1940,7 +1939,7 @@ msgstr ""
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "no s’ha especificat cap fitxer d’entrada"
@@ -2133,124 +2132,124 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "l’eixida del filtre no acaba en un caràcter de nova línia"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "l’argument de «%s» ha de ser un sol caràcter de puntuació"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "l’ordenació d’octets «%s» no és vàlida"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
 # No empra quote().  ivb
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "no s’ha d’indicar cap fitxer d’entrada si s’especifiquen «%s» i «%s»"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "«%s» necessita una especificació «-d DIRECTORI»"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "«%s» necessita una especificació «-l LOCALE»"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "«%s» necessita una especificació «--template PLANTILLA»"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "«%s» necessita una especificació «-o FITXER»"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "«%s» i «%s» són mútuament excloents en emprar «%s»"
 
 # ivb (2001/12/26)
 # ivb  Els «%s» es refereixen a opcions -> femení.
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "«%s» només és vàlida amb «%s» o «%s»"
 
 # ivb (2001/12/26)
 # ivb  Els «%s» es refereixen a opcions -> femení.
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "«%s» només és vàlida amb «%s», «%s» o «%s»"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "no s’ha pogut crear el fitxer d’eixida «%s»"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d missatge traduït"
 msgstr[1] "%d missatges traduïts"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducció difusa"
 msgstr[1] ", %d traduccions difuses"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d missatge no traduït"
 msgstr[1] ", %d missatges no traduïts"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] nom_fitxer.po…\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genera un catàleg binari de missatges partint d’una descripció textual de\n"
 "traduccions.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nom_fitxer.po…       Fitxers d’entrada.\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode de funcionament:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2259,7 +2258,7 @@ msgstr ""
 "  -j, --java           Mode Java: genera una classe «ResourceBundle» de "
 "Java.\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2268,13 +2267,13 @@ msgstr ""
 "      --java2          Com «--java», però assumeix Java2 (JDK 1.2 o "
 "superior).\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp         Mode C#: genera un fitxer «.dll» de .NET.\n"
 
 # Els recursos són cosa de la plataforma .NET, no només de C#.  ivb
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2286,7 +2285,7 @@ msgstr ""
 "                       .NET.\n"
 
 # Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl.  ivb
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2294,46 +2293,46 @@ msgstr ""
 "      --tcl            Mode Tcl: genera un fitxer «.msg» per a «msgcat» de\n"
 "                       Tcl.\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt             Mode Qt: genera un fitxer «.qm» de Qt.\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --desktop        Mode Desktop: genera un fitxer «.desktop».\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt             Mode Qt: genera un fitxer «.qm» de Qt.\n"
 
 # Ull!  En aquest cas no és un fitxer PO!  ivb
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict         Genera un fitxer estrictament conforme amb Uniforum.\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Si el fitxer d’eixida és «-» s’escriurà a l’eixida estàndard.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURS    Nom del recurs.\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2341,7 +2340,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOCALE    Nom del locale, bé «idioma» o bé «idioma_PA�S».\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2349,7 +2348,7 @@ msgid ""
 msgstr ""
 "      --source         Produeix un fitxer «.java» en lloc d’un «.class».\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2357,7 +2356,7 @@ msgstr ""
 "  -d DIRECTORI         Directori base de la jerarquia de directoris de les\n"
 "                       classes.\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2370,12 +2369,12 @@ msgstr ""
 "separats per un caràcter de subratllat.  L’opció «-d» és obligatòria.  La\n"
 "classe s’escriurà sota el directori especificat.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2384,7 +2383,7 @@ msgstr ""
 "  -d DIRECTORI         Directori base dels fitxers «.dll» dependents del\n"
 "                       locale.\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2395,18 +2394,18 @@ msgstr ""
 "subdirectori del directori especificat.  El nom del subdirectori depén del\n"
 "locale.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Ubicació del fitxer d’eixida al mode Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORI         Directori base dels catàlegs «.msg» de missatges.\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2416,23 +2415,23 @@ msgstr ""
 "el\n"
 "directori especificat.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Opcions del mode Desktop:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "      --template=FITXER    Empra un FITXER «.desktop» com a plantilla.\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORI         Directori base dels fitxers PO.\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2442,7 +2441,7 @@ msgstr ""
 "                       Cerca també la PARAULA clau indicada.\n"
 "  -k, --keyword        No cerca les paraules clau per defecte.\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2454,28 +2453,28 @@ msgstr ""
 "es llegiran els fitxers d’entrada del directori indicat en lloc dels donats\n"
 "com a arguments de la línia d’ordres.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, fuzzy, c-format
 msgid "XML mode options:\n"
 msgstr "Opcions del mode Desktop:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, fuzzy, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 "      --template=FITXER    Empra un FITXER «.desktop» com a plantilla.\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretació del fitxer d’entrada:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2487,14 +2486,14 @@ msgstr ""
 "domain».\n"
 
 # Segons la doc, quan ací diu «language» es refereix a un de programació.  ivb
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format    Comprova les cadenes de format dependents del\n"
 "                       llenguatge de programació.\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2504,7 +2503,7 @@ msgstr ""
 "                       capçalera.\n"
 
 # La directiva s’anomena «domain».  ivb
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2513,7 +2512,7 @@ msgstr ""
 "      --check-domain    Comprova si hi ha conflictes entre les directives\n"
 "                       «domain» i l’opció «--output-file».\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2523,7 +2522,7 @@ msgstr ""
 "                       Comprova si el «msgfmt» de GNU es comporta com el\n"
 "                       «msgfmt» d’X/Open.\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2534,12 +2533,12 @@ msgstr ""
 "                       Comprova la presència d’acceleradors de teclat per a\n"
 "                       ítems de menú.\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy      Empra a l’eixida les entrades difuses.\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2547,7 +2546,7 @@ msgstr ""
 "  -a, --alignment=NÚMERO\n"
 "                       Alinea les cadenes a NÚMERO octets (%d per defecte).\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2561,7 +2560,7 @@ msgstr ""
 "                       indicada (big-endian o little-endian, el valor per\n"
 "                       defecte depèn de la plataforma).\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2569,87 +2568,87 @@ msgstr ""
 "      --no-hash        Fa que el fitxer binari no incloga la taula de\n"
 "                       dispersió.\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics     Mostra estadístiques sobre les traduccions.\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose        Augmenta el nivell de descripció.\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "avís: la capçalera del fitxer PO manca o no és vàlida\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "avís: la conversió del joc de caràcters no funcionarà\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "avís: la capçalera del fitxer PO està marcada com a difusa\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "avís: les versions antigues de «msgfmt» ho indicaran com un error\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "el nom de domini «%s» no és adequat com a nom de fitxer"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "el nom de domini «%s» no és adequat com a nom de fitxer: se n’emprarà un "
 "prefix"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "es descarta la directiva «domain %s»"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "es descarta l’entrada «msgstr» buida"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "es descarta l’entrada «msgstr» difusa"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avís: el fitxer font conté una traducció difusa"
 
 # No empra quote().  ivb
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "«%s» no existeix"
 
 # No empra quote().  ivb
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "«%s» existeix però no s’ha pogut llegir"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error en llegir «%s»"
@@ -2914,12 +2913,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traduccions al català del paquet «%s»"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "el joc de caràcters actual, «%s», no és un nom portable de codificació"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "el fitxer d’entrada conté dos jocs de caràcters distints, «%s» i «%s»"
@@ -2941,7 +2940,7 @@ msgstr ""
 "el domini «%s» del fitxer d’entrada «%s» no conté una entrada de capçalera "
 "amb una especificació de joc de caràcters"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
@@ -2949,7 +2948,7 @@ msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "avís: "
@@ -3054,26 +3053,26 @@ msgstr ""
 # ivb (2002/01/03)
 # ivb  En aquestes frases, tant «nplurals» com «plural» es refereixen a
 # ivb  variables del camp «Plural-Forms» de la capçalera.
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "l’expressió de «plural» pot produir valors negatius"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "«nplurals» és %lu, però l’expressió de «plural» pot produir valors de fins a "
 "%lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "l’expressió de «plural» pot produir una divisió entre zero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "l’expressió de «plural» pot produir un desbordament enter"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -3085,51 +3084,51 @@ msgstr ""
 # ivb  El «%s» es refereix a un idioma, i tot el missatge recomana usar una
 # ivb  entrada de capçalera «Plural-Forms:».
 # L’idioma és el de «Language-Team» (en anglés).  ivb
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Proveu d’emprar açò, vàlid per a l’idioma «%s»:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "el catàleg de missatges té traduccions amb forma plural"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "però l’atribut «plural=EXPRESSIÓ» manca a l’entrada de capçalera"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "però l’atribut «nplurals=ENTER» manca a l’entrada de capçalera"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "el valor d’«nplurals» no és vàlid"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "l’expressió de «plural» no és vàlida"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "«nplurals» és %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "però alguns missatges només tenen una forma plural"
 msgstr[1] "però alguns missatges només tenen %lu formes plurals"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "però alguns missatges tenen una forma plural"
 msgstr[1] "però alguns missatges tenen %lu formes plurals"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -3137,65 +3136,65 @@ msgstr ""
 "el catàleg de missatges té traduccions amb forma plural, però hi manca una "
 "entrada de capçalera amb «Plural-Forms: nplurals=ENTER; plural=EXPRESSIÓ;»"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgid_plural» no comencen per «\\n»"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr[%u]» no comencen per «\\n»"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr» no comencen per «\\n»"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgid_plural» no acaben en «\\n»"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr[%u]» no acaben en «\\n»"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "ambdues entrades «msgid» i «msgstr» no acaben en «\\n»"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "el maneig de plurals és una extensió del «gettext» de GNU"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "manca la marca d’accelerador de teclat «%c» en «msgstr»"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "sobren marques d’accelerador de teclat «%c» en «msgstr»"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "el camp de capçalera «%s» encara té el valor inicial per defecte\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "manca el camp de capçalera «%s» a la capçalera\n"
 
 # Missatge d’error.  ivb
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 "s’han trobat els punts suspensius ASCII «...» en lloc del caràcter Unicode "
 "«…»"
 
 # Missatge d’error.  ivb
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 "s’ha trobat espai abans dels punts suspensius en una cadena visible per "
@@ -3203,7 +3202,7 @@ msgstr ""
 
 # Missatge d’error.  ivb
 # El caràcter adequat depèn del context.  ivb
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 "s’han trobat les cometes dobles ASCII «\"» en lloc del caràcter Unicode "
@@ -3211,30 +3210,38 @@ msgstr ""
 
 # Missatge d’error.  ivb
 # El caràcter adequat depèn del context.  ivb
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 "s’han trobat les cometes simples ASCII «'» en lloc del caràcter Unicode "
 "adequat"
 
-#: src/msgl-iconv.c:66
+# Missatge d’error.  ivb
+#: src/msgl-check.c:1163
+#, fuzzy, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+"s’han trobat els punts suspensius ASCII «...» en lloc del caràcter Unicode "
+"«…»"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: l’entrada no és vàlida segons la codificació «%s»"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: error en convertir de la condificació «%s» a la codificació «%s»"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "el fitxer d’entrada no conté una entrada de capçalera amb una especificació "
 "de joc de caràcters"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3244,7 +3251,7 @@ msgstr ""
 "permet l’ús d’aquesta conversió."
 
 # Es refereix a quelcom que _ha_ocorregut_.  ivb
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3253,8 +3260,8 @@ msgstr ""
 "La conversió de «%s» a «%s» crea duplicats: alguns msgid diferents esdevenen "
 "iguals."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3726,7 +3733,7 @@ msgstr "s’ha trobat un final de línia emmig de la cadena"
 msgid "context separator <EOT> within string"
 msgstr "s’ha trobat un separador de context «EOT» enmig de la cadena"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "aquest fitxer no ha de contenir directives «domain»"
@@ -3748,34 +3755,34 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr "avís: el caràcter Unicode no és vàlid"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "manca el nom d’un filtre"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "el valor d’«nplurals» no és vàlid"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "el fitxer «%s» és truncat"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "el fitxer «%s» conté una cadena no acabada en nul"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "el fitxer «%s» no és en el format MO de GNU"
 
 # ivb (2002/08/08)
 # ivb  «%s» és una cadena amb forma «sysdep_string[%u]»
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "el fitxer «%s» conté una cadena no acabada en nul, en «%s»"
@@ -3958,25 +3965,25 @@ msgstr "no s’ha pogut compil·lar la classe C#, per favor useu «--verbose»"
 msgid "compilation of C# class failed"
 msgstr "no s’ha pogut compil·lar la classe C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error en obrir «%s» per a escriure"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "«%s» no és un nom vàlid de classe Java"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "no s’ha pogut compil·lar la classe Java, per favor useu «--verbose» o "
 "establiu la variable d’entorn JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -4099,12 +4106,12 @@ msgstr ""
 "format de catàleg de missatges de Tcl no permet el tractament de\n"
 "plurals.\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: avís: la cadena no està terminada"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avís: l’expressió regular no està terminada"
@@ -4124,7 +4131,7 @@ msgstr "%s:%d: avís: la constant caràcter no està terminada"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avís: el literal cadena no està terminat"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code»."
@@ -4171,7 +4178,7 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # La funció.  ivb
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: ha fallat iconv()"
@@ -4186,7 +4193,7 @@ msgstr ""
 "%s:%d: La seqüència multioctet no és vàlida.\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: avís: el caràcter Unicode no és vàlid"
@@ -4206,57 +4213,57 @@ msgstr "%s:%d: avís: s’ha trobat «)» on s’esperava «}»"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avís: s’ha trobat «}» on s’esperava «)»"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 "«%s» no és nom de codificació vàlid, s’emprarà ASCII com a alternativa\n"
 
 # Realment és una comprovació tipogràfica.  ivb
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "la comprovació tipogràfica «%s» no és coneguda"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "el tipus d’acabament de frase «%s» no és conegut"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "no es pot emprar «--join-existing» quan s’escriu a l’eixida estàndard"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "«xgettext» no funciona sense paraules clau que cercar"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "avís: l’extensió «%2$s» del fitxer «%1$s» no és coneguda; es provarà amb el "
 "llenguatge «C»"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extreu les cadenes traduïbles dels fitxers d’entrada indicats.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4266,12 +4273,12 @@ msgstr ""
 "                       Empra «NOM.po» com a eixida (en lloc de «messages."
 "po»).\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FITXER    Escriu l’eixida al FITXER especificat.\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4280,12 +4287,12 @@ msgstr ""
 "                       Els fitxers d’eixida es desaran al DIRECTORI.\n"
 
 # Es refereix al llenguatge de programació.  ivb
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selecció del llenguatge del fitxer d’entrada:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4306,12 +4313,12 @@ msgstr ""
 "Glade,\n"
 "                       Lua, JavaScript, Vala, Desktop).\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++            Equival a «--language=C++».\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4321,7 +4328,7 @@ msgstr ""
 "fitxer\n"
 "d’entrada.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4330,20 +4337,20 @@ msgstr ""
 "      --from-code=NOM    Codificació dels fitxers d’entrada (excepte per a\n"
 "                       Python, Tcl i Glade).\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Per defecte s’assumeix que els fitxers d’entrada estan codificats en ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing    Uneix els missatges extrets amb els d’un fitxer\n"
 "                       existent.\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
@@ -4351,7 +4358,7 @@ msgstr ""
 "                       No extreu les entrades que ja es troben al FITXER.po\n"
 "                       indicat.\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4370,18 +4377,18 @@ msgstr ""
 "                       que precedeixen les línies amb una paraula clau.\n"
 
 # Realment és una comprovació tipogràfica.  ivb
-#: src/xgettext.c:1117
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NOM      Realitza una comprovació tipogràfica sobre els\n"
 "                       missatges: «ellipsis-unicode», «space-ellipsis» o\n"
 "                       «quote-unicode».\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4393,18 +4400,18 @@ msgstr ""
 "                       (un sol espai, per defecte) o «double-space» (dos\n"
 "                       espais).\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opcions específiques del llenguatge:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all    Extreu totes les cadenes.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4421,7 +4428,7 @@ msgstr ""
 "                       Vala.)\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4437,7 +4444,7 @@ msgstr ""
 "                       Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript i\n"
 "                       Vala, Desktop.)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4450,7 +4457,7 @@ msgstr ""
 "                       l’argument ARG de la paraula clau PARAULA.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4466,42 +4473,55 @@ msgstr ""
 "                       YCP, Tcl, Perl, PHP, GCC-source, Lua, JavaScript i\n"
 "                       Vala.)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs      Interpreta els trígrafs del C ANSI a l’entrada.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                       (Només per als llenguatges C, C++ i ObjectiveC.)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=FITXER\n"
+"                       Obté la llista de fitxers d’entrada del FITXER.\n"
+
+# No mola pq va darrere d’un punt…  ivb
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                       (Només per al llenguatge C++.)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt             Reconeix les cadenes de format de Qt.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                       (Només per al llenguatge C++.)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde            Reconeix les cadenes de format de KDE 4.\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost          Reconeix les cadenes de format de Boost.\n"
 
 # Simplement mireu l’info.  ivb
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4510,26 +4530,19 @@ msgstr ""
 "de\n"
 "                       cadenes de format.\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output\n"
 "                       Genera un fitxer amb sintaxi «.properties» de Java.\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=FITXER\n"
-"                       Obté la llista de fitxers d’entrada del FITXER.\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --indent         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
@@ -4537,7 +4550,7 @@ msgstr ""
 "                       Estableix a l’eixida la propietària o propietari del\n"
 "                       copyright.\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4546,21 +4559,21 @@ msgstr ""
 "a\n"
 "                       uns usuaris diferents.\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 "      --package-name=NOM\n"
 "                       Estableix a l’eixida el NOM del paquet.\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSIÓ\n"
 "                       Estableix a l’eixida la VERSIÓ del paquet.\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4570,7 +4583,7 @@ msgstr ""
 "cadenes\n"
 "                       «msgid».\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4582,7 +4595,7 @@ msgstr ""
 "dels\n"
 "                       valors les entrades «msgstr».\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4594,7 +4607,7 @@ msgstr ""
 "                       valors les entrades «msgstr».\n"
 
 # Missatge d’error.  ivb
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4602,29 +4615,29 @@ msgid ""
 msgstr ""
 "Un argument de «--flag» no té la sintaxi «PARCLAU:NUMARG:[pass-]INDIC»: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "entrada estàndard"
 
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Hi ha un caràcter no�ASCII en «%s%s»."
 
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Hi ha un comentari no�ASCII en o abans de «%s%s»."
 
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Hi ha una cadena no�ASCII en «%s%s»."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avís: "
@@ -4634,7 +4647,7 @@ msgstr "%s%s: avís: "
 # ivb  Ací el segon «%s» és el nom d’un llenguatge de programació.
 # El primer és «msgid» o «msgid_plural».  ivb
 # El motiu està traduït.  ivb
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4648,7 +4661,7 @@ msgstr ""
 # ivb  Ací el segon «%s» és el nom d’un llenguatge de programació.
 # El primer és «msgid» o «msgid_plural».  ivb
 # El motiu està traduït.  ivb
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4658,7 +4671,7 @@ msgstr ""
 "Motiu: %s\n"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4672,7 +4685,7 @@ msgstr ""
 "arguments amb nom, i un mapa en lloc d’una tupla per a aquests.\n"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4682,29 +4695,29 @@ msgstr ""
 "«gettext(\"\")» retorna l’entrada de capçalera amb metainformació, no la\n"
 "cadena buida.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "l’especificació d’argument per a la paraula clau «%.*s» és ambígua"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "avís: manca el context de la paraula clau «%.*s»"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "avís: manca el context de l’argument «plural» de la paraula clau «%.*s»"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "els contexts de les formes singular i plural no corcorden"
 
 # Multilínia.  ivb
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4717,7 +4730,7 @@ msgstr ""
 "d’ordres.\n"
 
 # Llenguatge de programació.  ivb
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "el llenguatge «%s» no és conegut"
@@ -4842,7 +4855,7 @@ msgstr "%s:%d: la interpolació «\\U» del caràcter de 8 bits «%c» no és vÃ
 
 # Multilínia.  ivb
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4852,7 +4865,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4866,7 +4879,7 @@ msgstr ""
 
 # Multilínia.  ivb
 # Hau!  ivb
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4879,7 +4892,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4892,7 +4905,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4905,7 +4918,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4918,22 +4931,22 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # No multilínia.  ivb
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "la codificació «%s» no és coneguda, s’emprarà ASCII al seu lloc"
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: la definició de cadena no és vàlida"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: manca un número després de «#»"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: l’expressió de cadena no és vàlida"
diff --git a/gettext-tools/po/cs.gmo b/gettext-tools/po/cs.gmo
index b9a0b4f..b895854 100644
--- a/gettext-tools/po/cs.gmo
+++ b/gettext-tools/po/cs.gmo
diff --git a/gettext-tools/po/cs.po b/gettext-tools/po/cs.po
index 948a10b..4474320 100644
--- a/gettext-tools/po/cs.po
+++ b/gettext-tools/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2001-08-18 15:22+0200\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -123,7 +123,7 @@ msgid "Unknown system error"
 msgstr "Neznámá systémová chyba"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -135,11 +135,11 @@ msgstr ""
 msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
 
-# lib/getopt.c:813
+# lib/getopt.c:628
 #: gnulib-lib/getopt.c:619
 #, fuzzy, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n"
+msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
 
 # lib/getopt.c:652
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
@@ -213,16 +213,16 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 # src/message.c:1182
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -246,39 +246,39 @@ msgstr ""
 
 # lib/xmalloc.c:82
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "pamì» vyèerpána"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -318,19 +318,19 @@ msgid "setting permissions for %s"
 msgstr ""
 
 # src/message.c:1115
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
 # src/message.c:1115
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
@@ -364,11 +364,11 @@ msgstr ""
 # src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298
 # src/msgunfmt.c:210 src/xgettext.c:532
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Více informací získáte pøíkazem `%s --help'.\n"
@@ -388,7 +388,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -401,21 +401,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr ""
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -427,11 +427,11 @@ msgstr ""
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
@@ -440,11 +440,11 @@ msgstr ""
 "anglicky), pøipomínky k pøekladu zasílejte na adresu <cs@li.org> (èesky).\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -456,10 +456,10 @@ msgstr ""
 # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
 # src/msgunfmt.c:180 src/xgettext.c:399
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor: %s\n"
@@ -492,19 +492,19 @@ msgstr ""
 # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
 # src/xget-lex.c:191 src/xgettext.c:616
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
 
 # src/msgfmt.c:909
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -512,10 +512,10 @@ msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
@@ -523,9 +523,9 @@ msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 # src/msgfmt.c:909
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -560,8 +560,7 @@ msgstr ""
 
 # src/msgfmt.c:892
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "poèet formátovacích specifikátorù v `msgid' a `msgstr' není stejný"
@@ -859,8 +858,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
@@ -877,59 +876,59 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
 # src/msgfmt.c:909
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "formátovací specifikátory pro argument %lu nejsou stejné"
 
 # src/msgfmt.c:909
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -977,7 +976,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1023,11 +1022,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
@@ -1042,11 +1041,10 @@ msgstr ""
 msgid "selector is not specified"
 msgstr "musí být zadány nejménì dva rùzné soubory"
 
-# src/message.c:1115
 #: src/its.c:326 src/its.c:1550
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create XPath context"
-msgstr "výstupní soubor \"%s\" nelze vytvoøit"
+msgstr ""
 
 #: src/its.c:344
 #, c-format
@@ -1068,12 +1066,11 @@ msgstr ""
 msgid "the root element is not \"rules\" under namespace %s"
 msgstr ""
 
-# src/message.c:1115
 #: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
 #: src/locating-rule.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read %s: %s"
-msgstr "výstupní soubor \"%s\" nelze vytvoøit"
+msgstr ""
 
 #: src/its.c:1573
 #, c-format
@@ -1103,12 +1100,12 @@ msgid "at most one input file allowed"
 msgstr ""
 
 # src/xgettext.c:378 src/xgettext.c:382
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s se vzájemnì vyluèují"
@@ -1125,7 +1122,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1135,10 +1132,10 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "vstupní soubor není zadán"
@@ -1148,10 +1145,10 @@ msgstr "vstupní soubor není zadán"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1163,23 +1160,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1188,7 +1185,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -1293,9 +1290,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1316,17 +1313,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1335,118 +1332,118 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "zadáno nemo¾né výbìrové kritérium (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1475,51 +1472,51 @@ msgstr ""
 "ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n"
 "v souborech bude ponecháno ze v¹ech .po souborù.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1527,26 +1524,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1666,7 +1663,7 @@ msgid "warning: this message is not used"
 msgstr "upozornìní: tato zpráva není pou¾ita"
 
 # src/po-lex.c:84
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1674,12 +1671,12 @@ msgstr[0] "nalezena %d záva¾ná chyba"
 msgstr[1] "nalezeny %d záva¾né chyby"
 msgstr[2] "nalezeno %d záva¾ných chyb"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "musí být zadány nejménì dva rùzné soubory"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1707,14 +1704,14 @@ msgstr ""
 "ponechány, ale pouze z prvního .po souboru, který je definuje. Oznaèení pozic\n"
 "v souborech bude ponecháno ze v¹ech .po souborù.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1760,7 +1757,7 @@ msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "vstupní soubor není zadán"
@@ -1926,79 +1923,79 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
 # src/xgettext.c:378 src/xgettext.c:382
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s a %s se vzájemnì vyluèují"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
 # src/message.c:1115
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "výstupní soubor \"%s\" nelze vytvoøit"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
 # src/msgfmt.c:343
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -2007,7 +2004,7 @@ msgstr[1] "%d pøelo¾ené zprávy"
 msgstr[2] "%d pøelo¾ených zpráv"
 
 # src/msgfmt.c:345
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -2016,7 +2013,7 @@ msgstr[1] ", %d neúplné pøeklady"
 msgstr[2] ", %d neúplných pøekladù"
 
 # src/msgfmt.c:347
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -2024,116 +2021,116 @@ msgstr[0] ", %d nepøelo¾ená zpráva"
 msgstr[1] ", %d nepøelo¾ené zprávy"
 msgstr[2] ", %d nepøelo¾ených zpráv"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2142,65 +2139,65 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2208,27 +2205,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2236,33 +2233,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2270,18 +2267,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2290,52 +2287,52 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "V hlavièce chybí definice znakové sady.\n"
 "Konverze zpráv do u¾ivatelovy znakové sady není mo¾ná.\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 # src/msgfmt.c:471
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "jméno domény \"%s\" není vhodné jako jméno souboru"
 
 # src/msgfmt.c:476
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -2343,47 +2340,47 @@ msgstr ""
 "pøedpona"
 
 # src/msgfmt.c:489
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "pøíkaz `domain %s' ignorován"
 
 # src/msgfmt.c:517
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "prázdná polo¾ka `msgstr' ignorována"
 
 # src/msgfmt.c:518
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "neúplná polo¾ka `msgstr' ignorována"
 
 # src/msgfmt.c:668
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornìní: zdrojový soubor obsahuje neúplný pøeklad"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pøi ètení \"%s\""
@@ -2562,12 +2559,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2585,14 +2582,14 @@ msgid ""
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: upozornìní: "
@@ -2661,62 +2658,62 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 # src/po-lex.c:332
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "neplatná øídící sekvence"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2724,7 +2721,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2732,108 +2729,113 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgid_plural' nezaèínají '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nezaèínají '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr' nezaèínají '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgid_plural' nekonèí '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr[%u]' nekonèí '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "obì polo¾ky `msgid' a `msgstr' nekonèí '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 # src/msgfmt.c:573
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "nìkteré polo¾ky hlavièky mají stále poèáteèní implicitní hodnotu"
 
 # src/msgfmt.c:561
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "polo¾ka hlavièky `%s' v hlavièce chybí"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 # src/msgunfmt.c:357 src/po-lex.c:74 src/xget-lex.c:159 src/xget-lex.c:174
 # src/xget-lex.c:191 src/xgettext.c:616
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "chyba pøi otevírání souboru \"%s\" pro ètení"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2842,15 +2844,15 @@ msgstr ""
 "Znaková sada \"%s\" není podporována. %s spoléhá na iconv()\n"
 "a iconv() \"%s\" nepodporuje.\n"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3260,7 +3262,7 @@ msgid "context separator <EOT> within string"
 msgstr ""
 
 # src/xgettext.c:658 src/xgettext.c:968
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento soubor nemù¾e obsahovat pøíkazy pro doménu"
@@ -3284,38 +3286,37 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-# src/gettextp.c:154
-#: src/read-desktop.c:403
-#, fuzzy, c-format
+#: src/read-desktop.c:405
+#, c-format
 msgid "missing '=' after \"%s\""
-msgstr "chybí argumenty"
+msgstr ""
 
 # src/po-lex.c:332
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "neplatná øídící sekvence"
 
 # src/msgunfmt.c:267 src/msgunfmt.c:331
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "soubor \"%s\" je useknutý"
 
 # src/msgunfmt.c:373
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL"
 
 # src/msgunfmt.c:373
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "soubor \"%s\" není v GNU .mo formátu"
 
 # src/msgunfmt.c:373
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "soubor \"%s\" obsahuje øetìzec, který není ukonèen NUL"
@@ -3496,23 +3497,23 @@ msgid "compilation of C# class failed"
 msgstr ""
 
 # src/msgfmt.c:321
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pøi otevírání souboru \"%s\" pro zápis"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3599,13 +3600,13 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:914
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
 # src/xget-lex.c:914
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
@@ -3627,7 +3628,7 @@ msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornìní: neukonèený øetìzec literálù"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3659,7 +3660,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3672,7 +3673,7 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:892
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: upozornìní: neukonèená znaková konstanta"
@@ -3693,80 +3694,80 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
 # src/xgettext.c:1342
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "jazyk `%s' není znám"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
 # src/xgettext.c:386
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing nemù¾e být pou¾it, je-li výstup zapisován do stdout"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nemù¾e pracovat bez toho, ani¾ by znal slova, která má hledat"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
 # src/xgettext.c:501
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "upozornìní: pøípona `%2$s' souboru `%1$s' není známa; zkusím C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "vstupní soubor není zadán"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3779,41 +3780,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3823,15 +3824,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3839,17 +3840,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3859,7 +3860,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3869,7 +3870,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3877,7 +3878,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3887,85 +3888,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3973,7 +3979,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3981,7 +3987,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3989,45 +3995,45 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:150
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standardní vstup"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: upozornìní: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4036,34 +4042,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4072,7 +4078,7 @@ msgid ""
 msgstr ""
 
 # src/xgettext.c:1342
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "jazyk `%s' není znám"
@@ -4176,13 +4182,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4190,7 +4196,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4198,7 +4204,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4206,7 +4212,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4214,7 +4220,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4222,22 +4228,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
@@ -4355,11 +4361,9 @@ msgstr ""
 msgid "inside an element name"
 msgstr ""
 
-# src/gettextp.c:154
 #: libgettextpo/markup.c:1509
-#, fuzzy
 msgid "inside an attribute name"
-msgstr "chybí argumenty"
+msgstr ""
 
 #: libgettextpo/markup.c:1513
 msgid "inside an open tag"
@@ -4386,14 +4390,6 @@ msgstr ""
 msgid "document ended unexpectedly: %s"
 msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Language \"glade\" is not supported. %s relies on expat.\n"
-#~ "This version was built without expat.\n"
-#~ msgstr ""
-#~ "Znaková sada \"%s\" není podporována. %s spoléhá na iconv().\n"
-#~ "Tato verze byla kompilována bez iconv().\n"
-
 # lib/getopt.c:733
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: neznámý pøepínaè -- %c\n"
diff --git a/gettext-tools/po/da.gmo b/gettext-tools/po/da.gmo
index 1a649a4..2b4b289 100644
--- a/gettext-tools/po/da.gmo
+++ b/gettext-tools/po/da.gmo
diff --git a/gettext-tools/po/da.po b/gettext-tools/po/da.po
index 1e7790c..1c89807 100644
--- a/gettext-tools/po/da.po
+++ b/gettext-tools/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.4-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-05-10 23:48+0200\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -110,7 +110,7 @@ msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -188,15 +188,15 @@ msgstr "ugyldigt source_version argument til compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ugyldigt target_version argument til compile_java_clas"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -220,39 +220,39 @@ msgid "%s subprocess I/O error"
 msgstr "I/O-fejl i %s-underproces"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "oprettelse af tråde mislykkedes"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "skrivning til %s-underproces mislykkedes"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "læsning fra %s-underproces mislykkedes"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, fuzzy, c-format
 msgid "communication with %s subprocess failed"
 msgstr "skrivning til %s-underproces mislykkedes"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, fuzzy, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s-underproces fejlede med slutstatus %d"
@@ -291,18 +291,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "kan ikke oprette datakanal"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle mislykkedes"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan ikke genskabe filnummer %d: dup2 mislykkedes"
@@ -334,11 +334,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv '%s --help' for yderligere oplysninger.\n"
@@ -358,7 +358,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -374,21 +374,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  vis denne hjælp og afslut\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  vis denne hjælp og afslut\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               vis versionsinformation og afslut\n"
@@ -398,20 +398,20 @@ msgstr "  -V, --version               vis versionsinformation og afslut\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapportér fejl på engelsk til <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -425,10 +425,10 @@ msgstr ""
 "Det er ikke NOGEN SOM HELST GARANTI, i det omfang som lov tillader.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
@@ -459,18 +459,18 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fejl ved læse-åbning af '%s'"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -478,19 +478,19 @@ msgstr ""
 "et formateringsdirektiv for argument '%u', som i '%s', findes ikke i '%s'"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formateringsdirektiv for argument %u findes ikke i '%s'"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -529,8 +529,7 @@ msgstr ""
 "Strengen refererer til argument nummer %u men ignorerer argument nummer %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antal af formatangivelser i '%s' og '%s' er ikke overensstemmende"
@@ -843,8 +842,8 @@ msgstr "formatangivelser i '%s' og '%s' er ikke de samme"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formateringsdirektiver i '%s' er ikke en delmængde af dem i '%s'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "et formateringsdirektiv for argument '%s' findes ikke i '%s'"
@@ -863,28 +862,28 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "I direktiv nummer %u følges '%c' ikke af et ciffer."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "I direktiv nummer %u følges '{' ikke af et argumentnummer."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "I direktiv nummer %u følges '%c' ikke af et ciffer."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "I direktiv nummer %u: en precision er ikke tilladt før '%c'."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, fuzzy, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "I direktiv nummer %u er argument %d negativt."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -892,33 +891,33 @@ msgstr ""
 "Strengen refererer til argumenter både via argumentnavne og via navnløse "
 "argumentspecifikationer."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Strengen refererer til argumentet '%s' på inkompatible måde."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "formateringsdirektiver i '%s' tager en afbildning, dem i '%s' tager en tuppel"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "formateringsdirektiver i '%s' tager en tuppel, dem i '%s' tager en afbildning"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "et formateringsdirektiv for argument '%s', som i '%s', findes ikke i '%s'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -973,7 +972,7 @@ msgstr ""
 "Tegnet som afslutter direktiv nummer %u er ikke et ciffer mellem 1 og 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1020,11 +1019,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresser for værtsnavnet\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativt uddata:\n"
@@ -1096,12 +1095,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "Højst én inddatalinje tilladt"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s udelukker hinanden"
@@ -1120,7 +1119,7 @@ msgstr ""
 "Filtrerer beskederne i et beskedskatalog efter deres attributter og\n"
 "manipulerer attributterne.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1132,10 +1131,10 @@ msgstr ""
 "tilsvarende\n"
 "korte tilvalg.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Placering for indfil:\n"
@@ -1145,10 +1144,10 @@ msgstr "Placering for indfil:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INFIL                       PO-indfil\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1160,23 +1159,23 @@ msgstr "  -D, --directory=KATALOG     søg også efter indfiler i KATALOG\n"
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "Hvis ingen indfil er givet eller hvis den er -, læses standard-ind.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Placering af uddatafil:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FIL       uddata skrives til FIL\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1187,7 +1186,7 @@ msgstr ""
 "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n"
 "eller hvis den er angivet til - .\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Meddelelsevalg:\n"
@@ -1308,9 +1307,9 @@ msgid ""
 msgstr ""
 "      --obsolete              samme som --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1333,17 +1332,17 @@ msgstr ""
 "      --stringtable-input     indfil har NeXTstep/GNUstep '.strings'-"
 "syntaks\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Resultatdetaljer:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1358,16 +1357,16 @@ msgstr ""
 "'auto'\n"
 "                              eller 'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=STILSKABELON    angiv CSS stilskabelønfil for --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1375,9 +1374,9 @@ msgstr ""
 "  -e, --no-escape             brug ikke C-kontrolsekvenser i resultatet\n"
 "                                (normaltilstand)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1385,28 +1384,28 @@ msgstr ""
 "  -E, --escape                brug C-kontrolsekvenser i resultatet, men\n"
 "                              ikke \\v eller \\a\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              skriv PO-fil selv hvis den er tom\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                lav indrykningsstíl i .po-fil\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           skriv ikke linjer med '#: filnavn:linje'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1414,39 +1413,39 @@ msgstr ""
 "  -n, --add-location          skriv linjer med '#: filnavn:"
 "linje' (normaltilstand)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     skriv en 'Java .properties'-fil\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    skriv en NeXTstep/GNUstep '.strings'-fil\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANTAL           sæt sidebredde for uddata\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1455,31 +1454,31 @@ msgstr ""
 "      --no-wrap               ombryd ikke lange beskeder, længere end\n"
 "                              uddatasidens bredde, til flere linjer\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sortér resultatet\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sortér resultatet efter filposition\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Umuligt udvælgelseskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1501,23 +1500,23 @@ msgstr ""
 "men hvis --use-first er angivet, vil de blive taget fra den første PO-fil,\n"
 "der definerer dem. Filpositioner fra alle PO-filer sammenbringes.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INFIL ...                   indfiler\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FIL        læs liste af indfiler fra FIL\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Hvis indfil er -, læses standard ind.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1526,7 +1525,7 @@ msgstr ""
 "  -<, --less-than=ANTAL       skriv meddelelser med mindre end ANTAL\n"
 "                              definitioner. Standardværdi: uendeligt\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1535,7 +1534,7 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelelser med mere end ANTAL\n"
 "                              definitioner. Standardværdi: 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1544,7 +1543,7 @@ msgstr ""
 "  -u, --unique                samme som --less-than=2, anfordrer at\n"
 "                              kun unikke meddelelser skrives\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1552,7 +1551,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      indfiler har 'Java .properties'-syntaks\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1562,12 +1561,12 @@ msgstr ""
 "      --stringtable-input     indfiler har NeXTstep/GNUstep '.strings'-"
 "syntaks\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAVN          kodning for resultatet\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1576,14 +1575,14 @@ msgstr ""
 "      --use-first             anvend først fundne oversættelse for hver\n"
 "                              meddelelse, sammenflet ikke oversættelser\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=KATALOGNAVN      sæt 'Language'-feltet i hovedet\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1688,19 +1687,19 @@ msgstr "denne tekst er brugt, men ikke erklæret i %s"
 msgid "warning: this message is not used"
 msgstr "advarsel: denne tekst bliver ikke brugt"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fandt %d fatal fejl"
 msgstr[1] "fandt %d fatale fejl"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "Mindst to filer skal angives"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1720,7 +1719,7 @@ msgstr ""
 "men kun fra den første PO-fil, der definerer dem. Filpositioner fra alle PO-filer\n"
 "vil blive sammenbragt.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1729,7 +1728,7 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelelser med mere end ANTAL\n"
 "                              definitioner. Standardværdi: 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1777,7 +1776,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "ingen inddatafil angivet"
@@ -1962,118 +1961,118 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentet til %s bør være et enkelt skilletegn"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ugyldig byteorden: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, fuzzy, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "Hvis ingen indfil er givet eller hvis den er -, læses standard-ind.\n"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s kræver at '-d katalog' angives"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s kræver en '-l lokale'-angivelse"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, fuzzy, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s kræver en '-l lokale'-angivelse"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, fuzzy, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s kræver en '-l lokale'-angivelse"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s og %s udelukker hinanden"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s er kun gyldig med %s eller %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s er kun gyldig med %s, %s eller %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "kan ikke oprette uddatafil '%s'"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversat tekst"
 msgstr[1] "%d oversatte tekster"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d uafklaret oversættelse"
 msgstr[1] ", %d uafklarede oversættelser"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversat tekst"
 msgstr[1] ", %d uoversatte tekster"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Brug: %s [FLAG] filnavn.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generér binært tekstkatalog fra oversættelsebeskrivelse i kildetekst.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filnavn.po ...              indfiler\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Kørselstilstand:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2082,7 +2081,7 @@ msgstr ""
 "  -j, --java                  Javatilstand: generér en Java ResourceBundle-"
 "klasse\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2091,12 +2090,12 @@ msgstr ""
 "      --java2                 som --java, og antag Java2 (JDK 1.2 eller "
 "højere)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C#-tilstand: generér en .NET .dll-fil\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2105,7 +2104,7 @@ msgstr ""
 "      --csharp-resources      C#-ressurcetilstand: generér en .NET ."
 "resources-fil\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2113,44 +2112,44 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: generér en .msg-fil af tcl/"
 "msgcat-type\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt-tilstand: generér en Qt .qm-fil\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, fuzzy, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --qt                    Qt-tilstand: generér en Qt .qm-fil\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    Qt-tilstand: generér en Qt .qm-fil\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Hvis UDFIL er -, skrives resultatet til standard ud.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Placering af uddatafil i Javatilstand:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    ressourcenavn\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2158,7 +2157,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, fuzzy, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2167,13 +2166,13 @@ msgstr ""
 "      --tcl                   Tcl-tilstand: inddata er en tcl/msgcat .msg-"
 "fil\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d KATALOG                  startkatalog for klassers katalogtræ\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2185,12 +2184,12 @@ msgstr ""
 "adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n"
 "i det opgivne katalog.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Placering for udfil i C#-tilstand:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2198,7 +2197,7 @@ msgid ""
 msgstr ""
 "  -d KATALOG                  startkatalog for localeafhængige .dll-filer\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2207,18 +2206,18 @@ msgstr ""
 "Flagene -l og -d er obligatoriske. .dll filen bliver skrevet i et\n"
 "underkatalog af det angivne katalog, hvis navn afhænger af localet.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Placering for udfil i Tcl-tilstand:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d KATALOG                  startkatalog for .msg-meddelelsekataloger\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2227,23 +2226,23 @@ msgstr ""
 "Flagene -l og -d er obligatoriske. .msg filen bliver skrevet i det\n"
 "angivne katalog.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, fuzzy, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 "  -d KATALOG                  startkatalog for .msg-meddelelsekataloger\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2252,7 +2251,7 @@ msgstr ""
 "  -kORD, --keyword[=ORD]      søg efter ORD som et ekstra nøgleord\n"
 "  -k, --keyword               brug ikke standardnøgleord\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2260,27 +2259,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Tolkning af indfil:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2291,13 +2290,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          kontrollér sprogafhængige formatstrenge\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2306,7 +2305,7 @@ msgstr ""
 "      --check-header          verificér tilstedeværelse og indhold af "
 "headerlinjen\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2316,7 +2315,7 @@ msgstr ""
 "domænedirektiver\n"
 "                                og flaget --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2325,7 +2324,7 @@ msgstr ""
 "  -C, --check-compatibility   kontrollér at GNU msgfmt opfører sig som\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2336,19 +2335,19 @@ msgstr ""
 "kortvejskommandoer\n"
 "                                for menuer\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             brug upræcise poster i resultatet\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=TAL         læg strenge på lige TAL byte (normalt: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2357,91 +2356,91 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               binærfil indholder ikke hashtabellen\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            udskriv statistik om oversættelserne\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 "  -v, --verbose               øg mængden af information i meddelelsen\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "advarsel: tegnsætskonvertering vil ikke virke\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "advarsel: PO-filhoved er uafklaret\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "advarsel: ældre versioner af msgfmt vil give en fejl for dette\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domænet '%s' kan ikke bruges som filnavn"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domænet '%s' er ikke brugbart som filnavn. Vil bruge præfiks istedet"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "'domain %s'-kommando ignoreres"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "tom 'msgstr'-kommando ignoreret"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "'fuzzy' 'msgstr'-tekst ignoreret"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s: advarsel: kildetekstfilen indeholder uafklarede oversættelser (fuzzy)"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved læsning af '%s'"
@@ -2682,12 +2681,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Danske oversættelser for pakke %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "nuværende tegnsæt '%s' er ikke et portabelt kodningsnavn"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "to forskellige tegnsæt '%s' og '%s' i indfilen"
@@ -2707,14 +2706,14 @@ msgstr ""
 "domæne '%s' i indfil '%s' mangler en indgang i hovedet med angivelse af "
 "tegnsæt"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "måltegnsæt '%s' er ikke et portabelt kodningsnavn"
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "advarsel: "
@@ -2808,74 +2807,74 @@ msgstr ""
 "Resultatet for '%s' kan blive forkert.\n"
 "En mulig måde at omgå problemet er at sætte LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "flertalsudtryk kan give negative værdier"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu men flertalsudtryk kan give værdier op til %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "flertalsudtryk kan give division med nul"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "flertalsudtryk kan give heltalsoverløb"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "flertalsudtryk kan give aritmetiske fejl, måske division med nul"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Prøv at bruge det følgende, gældende for %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "tekstkatalog har oversættelser med flertalsform"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "men headerindgange mangler attribut af type 'plurals=UDTRYK'"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "men headerindgange mangler attribut af type 'plurals=HELTAL'"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ugyldig nplurals-værdi"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ugyldigt flertalsudtryk"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "men nogen tekster har kun én flertalsform"
 msgstr[1] "men nogen tekster har kun %lu flertalsformer"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "men nogen tekster har én flertalsform"
 msgstr[1] "men nogen tekster har %lu flertalsformer"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2883,93 +2882,98 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer, men mangler en "
 "headerindgang med 'Plural-Forms: nplurals=HELTAL; plural=UDTRYK;'"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid' og 'msgid_plural'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' og `msgstr[%u]'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "'msgid' og 'msgstr' teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "'msgid' og 'msgid_plural'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "'msgid' og 'msgstr[%u]'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "'msgid' og 'msgstr' teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "flertalsbehandling er en GNU gettext-udvidelse"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr mangler mærket '%c' for tastaturgenvej"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har for mange mærker '%c' for tastaturgenveje"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "feltet '%s' i hovedet har stadig den oprindelige standardværdi\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "feltet '%s' mangler i hovedet\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: inddata er ikke gyldig i tegnkodningen '%s'"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: fejl opstod ved konvertering fra tegnkodning '%s' til tegnkodning '%s'"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "indfilen mangler en indgang i hovedet med angivelse af tegnsæt"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2978,7 +2982,7 @@ msgstr ""
 "Kan ikke konvertere fra '%s' til '%s'. %s bygger på iconv(), og iconv() "
 "understøtter ikke denne konvertering."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2987,8 +2991,8 @@ msgstr ""
 "Konvertering fra '%s' til '%s' giver dubletter: nogle msgid'er som er "
 "forskellige bliver ens."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3424,7 +3428,7 @@ msgstr "tekststreng var ikke afsluttet ved linjeskift"
 msgid "context separator <EOT> within string"
 msgstr "kontekstseparator <EOT> inde i streng"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fil må ikke indeholde 'domain'-kommandoer"
@@ -3446,32 +3450,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "filternavn mangler"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "ugyldig nplurals-værdi"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "filen '%s' er afkortet"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "filen '%s' indeholder en ikke-NUL afsluttet streng"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "filen '%s' er ikke i GNU .mo-format"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "filen '%s' indeholder en ikke-NUL-afsluttet streng, ved %s"
@@ -3654,25 +3658,25 @@ msgstr "oversættelse af C?-klasse mislykkedes, prøv gerne --verbose"
 msgid "compilation of C# class failed"
 msgstr "oversættelse af C#-klasse mislykkedes"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fejl opstået ved skrive-åbning af '%s'"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ikke et gyldigt Java-klassenavn: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "oversættelse af Java-klasse mislykkedes, prøv gerne --verbose eller sæt "
 "$JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "oversættelse af Java-klasse mislykkedes, prøv gerne at sætte $JAVAC"
@@ -3780,12 +3784,12 @@ msgstr ""
 "beskedkatalog har oversættelser med flertalsformer,\n"
 "men Tcl-formatet for beskedskataloger understøtter ikke flertalsformer\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: regulært udtryk ikke afsluttet"
@@ -3805,7 +3809,7 @@ msgstr "%s:%d: advarsel:  tegnkonstant ikke afsluttet korrekt"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Angiv venligst indkodning af kildetekst via --from-code."
 
@@ -3845,7 +3849,7 @@ msgstr ""
 "%s:%d: Ufuldstændug multibyte-sekvens ved slutning på linje.\n"
 "Angiv venligst korrekt indkodning af kildetekst via --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv-fejl"
@@ -3859,7 +3863,7 @@ msgstr ""
 "%s:%d: Ugyldig multibyte-sekvens.\n"
 "Angiv venligst indkodning af kildetekst via --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
@@ -3879,55 +3883,55 @@ msgstr "%s:%d: advarsel: ')' blev fundet hvor '}' forventedes"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: advarsel: '}' blev fundet hvor ')' forventedes"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "ukendt sprog '%s'"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikke benyttes når uddata sendes til standard-uddata"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbejde uden nogen nøgleord at kigge efter"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Udtræk oversættelige strenge fra givne indfiler.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3935,23 +3939,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAVN  brug NAVN.po som udfil (i st.f. messages.po) \n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FIL            skriv resultatet til FIL\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=KATALOG    udfiler placeres i kataloget KATALOG\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Valg af sprog for indfil\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3971,19 +3975,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kort skrivemåde for --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Som standard antages sproget ud fra endelsen på inddatafilen.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3992,23 +3996,23 @@ msgstr ""
 "      --from-code=NAVN        kodning af inddatafiler\n"
 "                                (undtagen for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Som standard antages inddatafilerne at være i ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         sammenflet meddelelser med eksisterende fil\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FIL.po   linjer fra FIL tages ikke ud\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4025,15 +4029,15 @@ msgstr ""
 "nøgleordslinjer\n"
 "                                 til resultatfilen\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4041,17 +4045,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Sprogspecifikke valg:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           uddrag alle strenge\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4065,7 +4069,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4079,7 +4083,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4089,7 +4093,7 @@ msgstr ""
 "      --flag=ORD:NR:FLAG      ekstra FLAG for strenge inde i argument\n"
 "                              nummer NR for nøgleord ORD\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4103,81 +4107,86 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             behandl ISO C tretegnssekvenser i indfiler\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (kun sprogene C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "  -f, --files-from=FIL        læs liste af indfiler fra FIL\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (kun sproget C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    genkend Qt-formatstrenge\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (kun sproget C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   genkend KDE 4-formatstrenge\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 genkend Boost-formatstrenge\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 mere detaljeret genkendelse af formatstrenge\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     skriv en 'Java .properties'-fil\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "  -f, --files-from=FIL        læs liste af indfiler fra FIL\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --indent                lav indrykningsstíl i resultatet\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRENG  sæt copyrightindehaver i resultatet\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr "      --foreign-user          udelad FSF-copyrighttekst i resultatet\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKKE    sæt pakkenavn i uddata\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  sæt pakkeversion i uddata\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4185,7 +4194,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOST@ADRESSE  sæt modtager for msgid-"
 "fejlrapporter\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4195,7 +4204,7 @@ msgstr ""
 "  -m[STRENG], --msgstr-prefix[=STRENG]  indled oversatte strenge med STRENG "
 "eller \"\"\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4205,7 +4214,7 @@ msgstr ""
 "  -M[STRENG], --msgstr-suffix[=STRENG]  afslut oversatte strenge med STRENG "
 "eller \"\"\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4213,31 +4222,31 @@ msgid ""
 msgstr ""
 "Et '--flag'-argument har ikke <nøgleord>:<nummer>:[pass-]<flag> syntaks: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standard-inddata"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Ikke-ASCII-tegn ved %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Ikke-ASCII-kommentar ved eller før %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Ikke-ASCII-streng ved %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: advarsel: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4246,7 +4255,7 @@ msgstr ""
 "%s er ikke en gyldig formatstreng for %s selvom den bruges i en "
 "formatstrengsposition. Årsag: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4255,7 +4264,7 @@ msgstr ""
 "%s er ikke en gyldig formatstreng for %s selvom den er deklareret som en. "
 "Årsag: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4269,7 +4278,7 @@ msgstr ""
 "Overvej i stedet at bruge en formatstreng med navngivne argumenter\n"
 "og en mapning i stedet for en liste for argumenter.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4279,28 +4288,28 @@ msgstr ""
 "gettext(\"\") returnerer hovedet med metainformation,\n"
 "ikke den tomme streng.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "flertydig argumentangivelse for nøgleord '%.*s'"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "advarsel: kontekst mangles for nøgleordet '%.*s'"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "advarsel: kontekst mangles for flertalsargumentet til nøgleordet '%.*s'"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontekst passer ikke mellem entals- og flertalsformen"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4313,7 +4322,7 @@ msgstr ""
 "variablen MSGID_BUGS_ADDRESS dér; ellers angiv\n"
 "tilvalget --msgid-bugs-address på kommandolinjen.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "ukendt sprog '%s'"
@@ -4423,7 +4432,7 @@ msgstr "%s:%d: ugyldig interpolation ('\\L') for 8bit-tegnet '%c'"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ugyldig interpolation ('\\U') for 8bit-tegnet '%c'"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4431,7 +4440,7 @@ msgstr ""
 "Angiv kildeindkodning med --from-code eller med en kommentar ifølge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4442,7 +4451,7 @@ msgstr ""
 "Angiv korrekt kildekodning med --from-code eller med en kommentar ifølge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4453,7 +4462,7 @@ msgstr ""
 "Angiv korrekt kildekodning med --from-code eller med en kommentar ifølge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4464,7 +4473,7 @@ msgstr ""
 "Angiv korrekt kildekodning med --from-code eller med en kommentar ifølge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4475,7 +4484,7 @@ msgstr ""
 "Angiv korrekt kildekodning med --from-code eller med en kommentar ifølge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4486,22 +4495,22 @@ msgstr ""
 "Angiv korrekt kildekodning med --from-code eller med en kommentar ifølge\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Ukendt kodning '%s'. Fortsætter med ASCII i stedet."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ugyldig streng-definition"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: mangler tal efter #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ugyldigt streng-udtryk"
diff --git a/gettext-tools/po/de.gmo b/gettext-tools/po/de.gmo
index 357b669..6062982 100644
--- a/gettext-tools/po/de.gmo
+++ b/gettext-tools/po/de.gmo
diff --git a/gettext-tools/po/de.po b/gettext-tools/po/de.po
index cab3f10..9e710ea 100644
--- a/gettext-tools/po/de.po
+++ b/gettext-tools/po/de.po
@@ -85,7 +85,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-06-26 13:05+0200\n"
 "Last-Translator: Philipp Thomas <pth@suse.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -189,7 +189,7 @@ msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -267,15 +267,15 @@ msgstr "ungültiges Argument source_version für compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ungültiges Argument target_version für compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Fehler beim Anlegen von »%s«"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -301,41 +301,41 @@ msgid "%s subprocess I/O error"
 msgstr "Subprozess %s mit Ein-/Ausgabefehler"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "Speicher aufgebraucht"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "Erstellung der Threads fehlgeschlagen"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "Schreiben zum Subprozess %s fehlgeschlagen"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "Lesen vom Subprozess %s fehlgeschlagen"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 "es ist nicht möglich, eine nicht-blockierende Ein/Ausgabe zum Subprozess %s\n"
 "zu setzen"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "Kommunikation mit dem Subprozess %s fehlgeschlagen"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "Subprozess %s wurde mit dem Exit-Code %d beendet"
@@ -374,18 +374,18 @@ msgstr "«"
 msgid "setting permissions for %s"
 msgstr "Festlegung der Berechtigungen für %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "Es ist nicht möglich, eine Pipe einzurichten"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle fehlgeschlagen"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr ""
@@ -418,11 +418,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
@@ -442,7 +442,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -457,21 +457,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                   diese Hilfe anzeigen und beenden\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                   diese Hilfe anzeigen und beenden\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
@@ -481,11 +481,11 @@ msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Fehler bitte auf Englisch an <bug-gnu-gettext@gnu.org> melden.\n"
@@ -494,11 +494,11 @@ msgstr ""
 "<translation-team-de@lists.sourceforge.net> zuständig.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -514,10 +514,10 @@ msgstr ""
 "Es gibt KEINE GARANTIE, soweit gesetzlich zulässig.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
@@ -548,37 +548,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument %u, wie in »%s«, fehlt in »%s«"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument »%u« fehlt in »%s«"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -620,8 +620,7 @@ msgstr ""
 "Argument."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -962,8 +961,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "die Formatspezifikationen in »%s« sind keine Untermenge von denen in »%s«"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument »%s« fehlt in »%s«"
@@ -983,21 +982,21 @@ msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 "In der %u. Formatanweisung darf »%c« nicht mit einem Feldnamen beginnen."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "In der %u. Formatanweisung darf »%c« nicht mit einem getattr-Argument "
 "beginnen."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 "In der %u. Formatanweisung darf »%c« nicht mit einem getitem-Argument "
 "beginnen."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -1005,13 +1004,13 @@ msgstr ""
 "In der %u. Formatanweisung ist in einem Formatbezeichner keine weitere "
 "Verschachtelung erlaubt."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 "In der %u. Formatanweisung gibt es eine nicht terminierte Formatanweisung."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -1019,7 +1018,7 @@ msgstr ""
 "Die Zeichenkette bezieht sich auf Argumente mit bezeichneten Argumenten und "
 "mit unbezeichneten Argumentspezifikationen."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
@@ -1027,7 +1026,7 @@ msgstr ""
 "Argument »%s«."
 
 # CHECKIT
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -1035,7 +1034,7 @@ msgstr ""
 "Formatspezifikationen in »%s« erwarten ein Mapping, die in »%s« jedoch ein "
 "Tupel"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -1044,13 +1043,13 @@ msgstr ""
 "ein\n"
 "Mapping"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument »%s«, wie in »%s«, fehlt in »%s«"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1114,7 +1113,7 @@ msgstr ""
 "zwischen 1 und 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1161,11 +1160,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      Adressen für den Rechnernamen\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative Ausgabe:\n"
@@ -1237,12 +1236,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "höchstens eine Eingabedatei erlaubt"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s und %s schließen sich gegenseitig aus"
@@ -1261,7 +1260,7 @@ msgstr ""
 "Meldungen eines Katalogs mit Ãœbersetzungen anhand von Attributen filtern und\n"
 "Attribute der Meldungen bearbeiten.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1272,10 +1271,10 @@ msgstr ""
 "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
 "notwendig.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Angaben zu Eingabedateien:\n"
@@ -1285,10 +1284,10 @@ msgstr "Angaben zu Eingabedateien:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  EINGABEDATEI                PO-Eingabedatei\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1303,24 +1302,24 @@ msgstr ""
 "Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n"
 "gelesen.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Angaben zu Ausgabedateien:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1332,7 +1331,7 @@ msgstr ""
 "oder\n"
 "»-« angegeben ist.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Auswahl der Meldungen:\n"
@@ -1457,9 +1456,9 @@ msgstr ""
 "      --obsolete              Synonym für »--only-obsolete --clear-"
 "obsolete«\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1484,17 +1483,17 @@ msgstr ""
 "      --stringtable-input     Eingabedatei folgt der .strings-Syntax von\n"
 "                                Nextstep/Gnustep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Details zur Ausgabe:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1509,17 +1508,17 @@ msgstr ""
 "                              Bei kann »always«, »never«, »auto« oder »html« "
 "sein.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=STILDATEI       CSS-Datei mit Stil-Regel für --color angeben\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1527,9 +1526,9 @@ msgstr ""
 "  -e, --no-escape             keine C-Escape-Sequenzen in Ausgabe verwenden\n"
 "                              (Vorgabe)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1537,30 +1536,30 @@ msgstr ""
 "  -E, --escape                C-Escape-Sequenzen und keine erweiterten\n"
 "                              Zeichen in Ausgabe verwenden\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              PO-Datei erstellen, auch wenn sie leer ist\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                Ausgabe eingerückt darstellen\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           Zeilen mit »#: Datei:Zeilennr.« nicht "
 "schreiben\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1568,8 +1567,8 @@ msgstr ""
 "  -n, --add-location          Zeilen mit »#: Datei:Zeilennr.« erhalten "
 "(Vorgabe)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1577,7 +1576,7 @@ msgstr ""
 "      --strict                .po-Datei streng nach Uniforum-Format "
 "erstellen\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
@@ -1586,9 +1585,9 @@ msgstr ""
 "  -p, --properties-output     Datei in der .properties-Syntax von Java\n"
 "                              ausgeben\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1596,18 +1595,18 @@ msgstr ""
 "      --stringtable-output    eine ».strings«-Datei von Nextstep/Gnustep\n"
 "                               erstellen\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 "  -w, --width=ANZAHL          Breite der Ausgabe auf ANZAHL Spalten "
 "festlegen\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1617,32 +1616,32 @@ msgstr ""
 "                               Breite der Ausgabe sind, nicht auf mehrere\n"
 "                               Zeilen umbrechen\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sortierte Ausgabe erstellen\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          Ausgabe gemäß Vorkommen in Dateien erstellen\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Auswahlkriterium nicht möglich (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1666,24 +1665,24 @@ msgstr ""
 "entsprechende Eintrag nur von der ersten PO-Datei berücksichtigt, in der der\n"
 "Eintrag vorkommt.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  EINGABEDATEI...             Eingabedateien\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=DATEI      Namen der Eingabedateien aus DATEI holen\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Wenn die Eingabedatei »-« ist, wird die Standardeingabe gelesen.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1692,7 +1691,7 @@ msgstr ""
 "  -<, --less-than=ANZAHL     Meldungen mit weniger als ANZAHL Definitionen\n"
 "                             anzeigen (Vorgabe: unendlich)\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1701,7 +1700,7 @@ msgstr ""
 "  ->, --more-than=ANZAHL     Meldungen mit mehr als ANZAHL Definitionen\n"
 "                             anzeigen (Vorgabe: 0)\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1710,7 +1709,7 @@ msgstr ""
 "  -u, --unique               Abkürzung für »--less-than=2«; Meldungen\n"
 "                             anfordern, die nur einmal vorkommen\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1720,7 +1719,7 @@ msgstr ""
 "von\n"
 "                              Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1731,12 +1730,12 @@ msgstr ""
 "Syntax\n"
 "                              für .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          Kodierung für die Ausgabe\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1746,7 +1745,7 @@ msgstr ""
 "                               Meldung verwenden, nicht mehrere\n"
 "                               Ãœbersetzungen zusammenziehen\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1754,7 +1753,7 @@ msgstr ""
 "      --lang=KATALOGNAME      »Language«-Feld in dem Kopfeintrag setzen\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1861,19 +1860,19 @@ msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
 msgid "warning: this message is not used"
 msgstr "Warnung: diese Meldung kommt nicht vor"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "es ist %d fataler Fehler aufgetreten"
 msgstr[1] "es sind %d fatale Fehler aufgetreten"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "es müssen mindestens zwei Dateien angegeben werden"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1895,7 +1894,7 @@ msgstr ""
 "Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n"
 "kumuliert.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1904,7 +1903,7 @@ msgstr ""
 "  ->, --more-than=ANZAHL      Meldungen mit mehr als ANZAHL Definitionen\n"
 "                               anzeigen (Vorgabe: 1)\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1961,7 +1960,7 @@ msgstr ""
 "      --strict                .po-Datei streng nach Uniforum-Format "
 "erstellen\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "Eingabedatei fehlt"
@@ -2154,119 +2153,119 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "Die Ausgabe des Filters endet nicht mit einem Zeilenumbruch"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "das Argument für %s sollte ein einzelnes Interpunktionszeichen sein"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ungültiger Endian-Wert: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 "Wenn %s und %s angegeben sind, sollte keine Eingabedatei angegeben werden"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s erfordert eine Angabe in der Art »-d Verzeichnis«"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s erfordert eine Angabe in der Art »-l Spracheinstellung«"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s erfordert eine Angabe in der Art »--template Vorlage«"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s erfordert eine Angabe in der Art »-o Datei«"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s und %s schließen sich in %s gegenseitig aus"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s ist nur mit %s oder %s gültig"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s ist nur mit %s, %s oder %s gültig"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "Ausgabedatei »%s« kann nicht erstellt werden"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d übersetzte Meldung"
 msgstr[1] "%d übersetzte Meldungen"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ungenaue Ãœbersetzung"
 msgstr[1] ", %d ungenaue Ãœbersetzungen"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d unübersetzte Meldung"
 msgstr[1] ", %d unübersetzte Meldungen"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Aufruf: %s [OPTION] Datei.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Binären Katalog mit Meldungen aus der textuellen Übersetzung erstellen.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  Datei.po ...                Eingabedateien\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Art der Verarbeitung:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2276,7 +2275,7 @@ msgstr ""
 "Java\n"
 "                               erstellen\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2285,13 +2284,13 @@ msgstr ""
 "      --java2                 wie --java, aber Java2 (JDK 1.2 oder höher) "
 "annehmen\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --qt                    C#-Modus: eine .dll-Datei für .NET erstellen\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2300,7 +2299,7 @@ msgstr ""
 "      --csharp-resources      C#-Ressourcenmodus: eine .resources-Datei für\n"
 "                                .NET erstellen\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2308,13 +2307,13 @@ msgstr ""
 "      --tcl                   Tcl-Modus: eine .msg-Datei für tcl/msgcat "
 "erstellen\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 "      --qt                    Qt-Modus: eine .qm-Datei für Qt erstellen\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2322,37 +2321,37 @@ msgstr ""
 "      --desktop               Desktopeintrag-Modus: erzeugt eine .desktop-"
 "Datei\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 "      --qt                    Qt-Modus: eine .qm-Datei für Qt erstellen\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict             Datei streng nach Uniforum-Format erstellen\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben "
 "ist.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Angaben zu Ausgabedateien im Java-Modus:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    Name der Ressource\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2363,7 +2362,7 @@ msgstr ""
 "                               (z. B. »de«) oder »Sprache_LAND\" (z. B. "
 "»de_DE«)\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2372,7 +2371,7 @@ msgstr ""
 "      --source                erstellt eine .java-Datei anstelle einer ."
 "class-Datei\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2381,7 +2380,7 @@ msgstr ""
 "mit\n"
 "                               den Klassen\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2397,12 +2396,12 @@ msgstr ""
 "Verzeichnis\n"
 "geschrieben.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Angaben zu Ausgabedateien im C#-Modus:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2412,7 +2411,7 @@ msgstr ""
 "Spracheinstellung\n"
 "                               abhängigen .dll-Dateien\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2423,19 +2422,19 @@ msgstr ""
 "von\n"
 "der Spracheinstellung abhängig ist.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Angaben zu Ausgabedateien im Tcl-Modus:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d VERZEICHNIS              Basis-Verzeichnis der .msg-Kataloge mit "
 "Meldungen\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2444,24 +2443,24 @@ msgstr ""
 "Die Optionen »-l« und »-d« sind notwendig.  Die .msg-Datei wird in das\n"
 "angegebene Verzeichnis geschrieben.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Optionen für Desktopeintrag-Modus:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "  --template=VORLAGE          eine als Vorlage zu verwendende .desktop-"
 "Datei\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d VERZEICHNIS              Basisverzeichnis der .po-Dateien\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2472,7 +2471,7 @@ msgstr ""
 "  -k, --keyword               es wird nicht nach den vorgegebenen\n"
 "                              Schlüsselwörtern gesucht\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2484,29 +2483,29 @@ msgstr ""
 "werden Dateien aus dem Verzeichnis anstelle der Befehlszeilenargumente "
 "gelesen.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, fuzzy, c-format
 msgid "XML mode options:\n"
 msgstr "Optionen für Desktopeintrag-Modus:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, fuzzy, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 "  --template=VORLAGE          eine als Vorlage zu verwendende .desktop-"
 "Datei\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Überprüfung der Eingabedatei:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2517,13 +2516,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          sprachabhängige Formatelemente überprüfen\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2532,7 +2531,7 @@ msgstr ""
 "      --check-header          Existenz und Inhalt des Kopfeintrags "
 "verifizieren\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2542,7 +2541,7 @@ msgstr ""
 "die\n"
 "                                Option --output-file hin überprüfen\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2552,7 +2551,7 @@ msgstr ""
 "Open\n"
 "                                msgfmt verhält\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2563,14 +2562,14 @@ msgstr ""
 "                                Vorhandensein des Tastatur-Accelerators\n"
 "                                 für Menüeinträge überprüfen\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             auch ungenaue Übersetzungen (»fuzzy«) "
 "verwenden\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2578,7 +2577,7 @@ msgstr ""
 "  -a, --alignment=ZAHL        Ausgaben an ZAHL (Vorgabe: %d) Bytegrenze\n"
 "                               ausrichten\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2591,96 +2590,96 @@ msgstr ""
 "                                (»big« oder »little«, Standard von Plattform "
 "abhängig)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               Binärdatei soll keine Hash-Tabelle enthalten\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            Statistik zu den Ãœbersetzungen anzeigen\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 "  -v, --verbose               mehr Hinweise während der Verarbeitung geben\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "Warnung: Kopfteil der PO-Datei fehlt oder ist ungültig\n"
 
 # = Konvertierung der Meldung in Hinblick auf den Zeichensatz
 # 2001-03-11 20:56:03 CET -ke-
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "Warnung: Konvertierung des Zeichensatzes wird fehlschlagen.\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "Warnung: ältere Versionen von »msgfmt« werden hierbei einen Fehler melden\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "Bereichsname »%s« ist nicht als Dateiname geeignet; Präfix wird verwendet."
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "»domain %s«-Anweisung wird ignoriert"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "leerer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s existiert nicht"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existiert, aber kann nicht gelesen werden"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
@@ -2940,12 +2939,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "German translation for %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "der Zeichensatz »%s« bezeichnet keine portable Kodierung"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "zwei unterschiedliche Zeichensätze »%s« und »%s« in Eingabedatei"
@@ -2966,14 +2965,14 @@ msgstr ""
 "bei Bereich »%s« der Eingabedatei »%s« fehlt Kopfeintrag mit der Angabe des\n"
 "Zeichensatzes"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "Zeichensatz »%s« für die Ausgabe bezeichnet keine portable Kodierung"
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "Warnung: "
@@ -3068,24 +3067,24 @@ msgstr ""
 "portable Kodierung. Die Ausgabe von »%s« könnte nicht korrekt sein.\n"
 "Eine mögliche Abhilfe ist, LC_ALL=C zu setzen.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "Pluralausdruck kann negative Werte ergeben"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu, aber Pluralausdruck kann Werte so groß wie %lu ergeben"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "Pluralausdruck kann Teilung durch Null ergeben"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "Pluralausdruck kann einen Ganzzahl-Ãœberlauf ergeben"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -3094,51 +3093,51 @@ msgstr ""
 "Teilung\n"
 "durch Null"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Bitte das Folgende versuchen; gültig für %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "Katalog mit Meldungen weist Ãœbersetzungen mit Pluralformen auf"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "aber dem Kopfeintrag fehlt das Attribut »plural=AUSDRUCK«"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "aber dem Kopfeintrag fehlt das Attribut »nplurals=GANZZAHL«"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ungültige Pluralwerte"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ungültiger Pluralausdruck"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "aber einige Meldungen haben nur eine Pluralform"
 msgstr[1] "aber einige Meldungen haben nur %lu Pluralformen"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "aber einige Meldungen haben eine Pluralform"
 msgstr[1] "aber einige Meldungen haben %lu Pluralformen"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -3147,95 +3146,100 @@ msgstr ""
 "Kopfeintrag fehlt die Zeile:\n"
 "»Plural-Forms: nplurals=GANZZAHL; plural=AUSDRUCK;«"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr_plural«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr[%u]«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "»msgid«- und »msgstr«-Eintrag beginnen nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr_plural«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr[%u]«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "»msgid«- und »msgstr«-Eintrag enden nicht jeweils mit »\\n«"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "Die Plural-Behandlung ist eine Erweiterung von GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Schnellzugriff"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Schnellzugriff "
 "auf"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr ""
 "Das Feld »%s« im Kopfeintrag hat immer noch den anfänglichen Vorgabewert\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "ASCII-Ellipsis („...“) anstelle von Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 "Leerzeichen vor Ellipsis in für Benutzer sichtbaren Zeichenketten gefunden"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Doppelte ASCII-AnfÃœhrungszeichen anstelle von Unicode gefunden"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Einfache ASCII-AnfÃœhrungszeichen anstelle von Unicode gefunden"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, fuzzy, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII-Ellipsis („...“) anstelle von Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: Eingabe ist in der Kodierung »%s« nicht gültig"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: Fehler beim Konvertieren von der Kodierung »%s« nach der\n"
 "Kodierung »%s«"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3244,7 +3248,7 @@ msgstr ""
 "Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
 "%s hängt von iconv() ab, und iconv() unterstützt diese Konvertierung nicht."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3253,8 +3257,8 @@ msgstr ""
 "Konvertierung »%s« nach »%s« führt zu doppelten Einträgen: unterschiedliche "
 "msgids werden gleich."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3708,7 +3712,7 @@ msgstr "Zeilenende innerhalb einer Zeichenkette"
 msgid "context separator <EOT> within string"
 msgstr "Kontext-Trenner <EOT> innerhalb einer Zeichenkette"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "diese Datei darf keine »domain«-Anweisung enthalten"
@@ -3730,32 +3734,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr "Warnung: ungültiges Unicode-Zeichen"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "Name des Filters fehlt"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "ungültige Pluralwerte"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "Datei »%s« ist verstümmelt"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "Datei »%s« hat eine nicht mit NUL terminierte Zeichenkette"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "Datei »%s« ist nicht im GNU .mo-Format"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "Datei »%s« hat bei %s eine nicht mit NUL terminierte Zeichenkette"
@@ -3939,25 +3943,25 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr "Kompilierung der C#-Klasse ist fehlgeschlagen"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "Fehler beim Öffnen von »%s« zum Schreiben"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "kein gültiger Name einer Java-Klasse: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Kompilierung der Java-Klasse ist fehlgeschlagen; bitte versuchen Sie\n"
 "--verbose oder setzen Sie $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -4076,12 +4080,12 @@ msgstr ""
 "Katalog mit Meldungen weist Ãœbersetzungen mit Pluralformen auf, aber der\n"
 "Tcl-Katalog mit den Meldungen unterstützt keine Pluralbehandlung\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: Warnung: regulärer Ausdruck nicht korrekt terminiert"
@@ -4101,7 +4105,7 @@ msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt terminiert"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Bitte die Kodierung des Quelltextes mit --from-code angeben."
 
@@ -4141,7 +4145,7 @@ msgstr ""
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: Fehler von iconv"
@@ -4155,7 +4159,7 @@ msgstr ""
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: Warnung: ungültiges Unicode-Zeichen"
@@ -4175,60 +4179,60 @@ msgstr "%s:%d: Warnung: »)« gefunden, wo »}« erwartet wurde"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: Warnung: »}« gefunden, wo »)« erwartet wurde"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 "»%s« ist kein gültiger Name für eine Zeichenkodierung. ASCII wird "
 "ersatzweise verwendet.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "Syntaxprüfung „%s“ ist unbekannt"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "Satzende vom Typ „%s“ ist unbekannt"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "»--join-existing« kann nicht benutzt werden, wenn nach Standardausgabe\n"
 "geschrieben wird"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 "ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "Warnung: Typ der Datei »%s« mit Suffix »%s« ist unbekannt; C wird versucht"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4236,25 +4240,25 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME   Ausgabe in NAME.po (anstatt in messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=DATEI          Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=VERZ       Ausgabedateien in Verzeichnis VERZ ablegen\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wahl der Sprache für die Eingabedatei:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4275,12 +4279,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   Abkürzung für --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4290,7 +4294,7 @@ msgstr ""
 "Eingabedatei\n"
 "geraten.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4299,24 +4303,24 @@ msgstr ""
 "      --from-code=NAME        Kodierung der Eingabedateien\n"
 "                               (außer für Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Die Vorgabe ist, dass für Eingabedateien ASCII angenommen wird.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         Meldungen an existierende Datei anhängen\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=DATEI.po Einträge aus DATEI.po nicht herausholen\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4335,19 +4339,19 @@ msgstr ""
 "                               Schlüsselworten vorausgehen, in die\n"
 "                               Ausgabedatei schreiben.\n"
 
-#: src/xgettext.c:1117
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NAME            Syntaxprüfung für Meldungen "
 "durchführen                                (ellipsis-unicode, space-"
 "ellipsis,\n"
 "                                 quote-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4358,17 +4362,17 @@ msgstr ""
 "                                (single-space, die Vorgabe, \n"
 "                                 oder double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Besondere Optionen bei »Language«:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all          alle Zeichenketten extrahieren\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4383,7 +4387,7 @@ msgstr ""
 "                                Tcl, Perl, PHP, GCC-source, Glade\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4399,7 +4403,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-Source, Glade\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4410,7 +4414,7 @@ msgstr ""
 "der\n"
 "                               Argumentzahl ARG des Schlüsselworts WORT\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4425,41 +4429,52 @@ msgstr ""
 "                                Perl, PHP, GCC-source\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs            Trigraph-Zeichen von ANSI C bei der Eingabe\n"
 "                              erkennen\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (nur die Programmiersprachen C, C++,\n"
 "                                 ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=DATEI      Namen der Eingabedateien aus DATEI holen\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (nur die Programmiersprache C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Zeichenketten im Qt-Format erkennen\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (nur die Programmiersprache C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   Zeichenketten im KDE 4-Format erkennen\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Zeichenketten im Boost-Format erkennen\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4467,30 +4482,24 @@ msgstr ""
 "      --debug                 detaillierteres Ergebnis bei Erkennung der\n"
 "                               Formatelemente\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     eine ».properties«-Datei von Java erstellen\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=DATEI      Namen der Eingabedateien aus DATEI holen\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --indent                Ausgabe eingerückt darstellen\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=KETTE   Uhrheberrechtsinhaber in Ausgabe setzen\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4498,24 +4507,24 @@ msgstr ""
 "      --foreign-user          keine Zeile mit FSF-Copyright in Ausgabe\n"
 "                               einfügen\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    Paketname für die Ausgabe setzen\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  Paketversion in Ausgabe setzen\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADRESSE  Adresse für msgid-Fehler angeben\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4527,7 +4536,7 @@ msgstr ""
 "msgstr\n"
 "                                 nehmen\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4539,7 +4548,7 @@ msgstr ""
 "msgstr\n"
 "                                 nehmen\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4548,31 +4557,31 @@ msgstr ""
 "Ein --flag-Argument folgt nicht der <keyword>:<argnum>:[pass-]<flag>-Syntax: "
 "%s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "Standardeingabe"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Nicht in ASCII kodiertes Zeichen bei %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Nicht in ASCII kodierter Kommentar bei oder vor %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Nicht in ASCII kodierte Zeichenkette bei oder vor %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: Warnung: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4581,7 +4590,7 @@ msgstr ""
 "Obwohl es an der Position eines Formatelements verwendet wird, ist %s kein "
 "gültiges %s Formatelement. Der Grund: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4590,7 +4599,7 @@ msgstr ""
 "Obwohl es so deklariert wurde, ist %s kein gültiges %s Formatelement. Der "
 "Grund: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4604,7 +4613,7 @@ msgstr ""
 "Verwenden Sie besser ein Formatelement mit bezeichneten Argumenten\n"
 "und einem Mapping anstelle eines Tupels für die Argumente.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4614,28 +4623,28 @@ msgstr ""
 "gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n"
 "zurück, keine leere Zeichenkette.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "mehrdeutige Argumentspezifikation für das Schlüsselwort »%.*s«"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "Warnung: fehlender Kontext für das Schlüsselwort »%.*s«"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "Warnung: fehlender Kontext für das Plural-Argument des Schlüsselwortes »%.*s«"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "Abweichung beim Kontext zwischen Singular- und Pluralform"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4647,7 +4656,7 @@ msgstr ""
 "Variable MSGID_BUGS_ADDRESS aus; falls nicht, geben Sie bitte die\n"
 "Option an der Befehlszeile mit --msgid-bugs-address an.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "Programmiersprache »%s« unbekannt"
@@ -4757,7 +4766,7 @@ msgstr "%s:%d: ungültige Interpolation (»\\L«) bei dem 8-Bit-Zeichen »%c«"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\U«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4767,7 +4776,7 @@ msgstr ""
 "angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4780,7 +4789,7 @@ msgstr ""
 "angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4793,7 +4802,7 @@ msgstr ""
 "angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4806,7 +4815,7 @@ msgstr ""
 "angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4819,7 +4828,7 @@ msgstr ""
 "angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4832,22 +4841,22 @@ msgstr ""
 "angeben, wie er bei http://www.python.org/peps/pep-0263.html spezifiziert "
 "ist.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unbekannt Kodierung »%s«. Es wird stattdessen mit ASCII fortgefahren."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ungültige Definition einer Zeichenkette"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: Zahl nach # fehlt"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ungültiger Ausdruck einer Zeichenkette"
diff --git a/gettext-tools/po/el.gmo b/gettext-tools/po/el.gmo
index 278dab7..331881c 100644
--- a/gettext-tools/po/el.gmo
+++ b/gettext-tools/po/el.gmo
diff --git a/gettext-tools/po/el.po b/gettext-tools/po/el.po
index adc539b..9e8603a 100644
--- a/gettext-tools/po/el.po
+++ b/gettext-tools/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
@@ -117,7 +117,7 @@ msgid "Unknown system error"
 msgstr "¶ãíùóôï óöÜëìá óõóôÞìáôïò"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -133,7 +133,7 @@ msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n"
 #: gnulib-lib/getopt.c:619
 #, fuzzy, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: ç åðéëïãÞ `-W %s' åßíáé äéöïñïýìåíç\n"
+msgstr "%s: ç åðéëïãÞ `%s' åßíáé äéöïñïýìåíç\n"
 
 #
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
@@ -207,16 +207,16 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -240,39 +240,39 @@ msgstr ""
 
 #
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "H ìíÞìç åîáíôëÞèçêå"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -312,19 +312,19 @@ msgid "setting permissions for %s"
 msgstr ""
 
 #
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
 #
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
@@ -357,11 +357,11 @@ msgstr ""
 
 #
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "ÄïêéìÜóôå `%s --help' ãéá ðåñéóóüôåñåò ðëçñïöïñßåò.\n"
@@ -381,7 +381,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -394,21 +394,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr ""
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -419,21 +419,21 @@ msgstr ""
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Óôåßëôå áíáöïñÝò óöáëìÜôùí óôï <bug-gnu-utils@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -444,10 +444,10 @@ msgstr ""
 
 #
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ÃñáììÝíï áðü ôïí/ôçí %s.\n"
@@ -480,19 +480,19 @@ msgstr ""
 
 #
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
 
 #
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -500,10 +500,10 @@ msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
@@ -511,9 +511,9 @@ msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 #
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -548,8 +548,7 @@ msgstr ""
 
 #
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -848,8 +847,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
@@ -866,40 +865,40 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
 #
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -907,7 +906,7 @@ msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
 #
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -915,14 +914,14 @@ msgstr ""
 "ï áñéèìüò ôùí áíáöïñþí óå ìïñöïðïéÞóåéò ôùí `msgid' êáé `msgstr' äå óõìðßðôåé"
 
 #
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "ïé ìïñöïðïéÞóåéò ãéá ôç ðáñÜìåôñï %u äåí åßíáé ßäéåò"
 
 #
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -970,7 +969,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1016,11 +1015,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
@@ -1098,12 +1097,12 @@ msgid "at most one input file allowed"
 msgstr "áðáéôïýíôáé áêñéâþò äýï áñ÷åßá åéóüäïõ"
 
 #
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
@@ -1120,7 +1119,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1130,10 +1129,10 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
@@ -1143,10 +1142,10 @@ msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1158,23 +1157,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1183,7 +1182,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -1288,9 +1287,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1311,17 +1310,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1330,88 +1329,88 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
 #
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1429,33 +1428,33 @@ msgstr ""
 "  -S, --strict             ìïñöÞ åîüäïõ ôï áõóôçñü Uniforum\n"
 "  -V, --version            åìöÜíéóç ðëçñïöïñéþí Ýêäïóçò êáé Ýîïäïò\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
 #
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Ý÷åé åðéëå÷èåß áäýíáôï êñéôÞñéï åðéëïãÞò (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
 #
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1485,51 +1484,51 @@ msgstr ""
 "ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n"
 "èá äéáôçñçèïýí.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1537,26 +1536,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1677,20 +1676,20 @@ msgid "warning: this message is not used"
 msgstr "ðñïåéäïðïßçóç: áõôü ôï ìÞíõìá äåí ÷ñçóéìïðïåßôáé"
 
 #
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "âñÝèçêáí %d óïâáñÜ óöÜëìáôá"
 
 #
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "ðñÝðåé íá ïñéóôïýí ôïõëÜ÷éóôïí äýï áñ÷åßá"
 
 #
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1719,14 +1718,14 @@ msgstr ""
 "ðñþôï áñ÷åßï PO ðïõ ôá Ý÷åé ïñßóåé. Ïé èÝóåéò áñ÷åßïõ áðü üëá ôá áñ÷åßá PO\n"
 "èá äéáôçñçèïýí.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1772,7 +1771,7 @@ msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 #
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
@@ -1940,208 +1939,208 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
 #
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "ôá %s êáé %s åßíáé áìïéâáßá áðïêëåéþìåíá"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
 #
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "áäõíáìßá äçìéïõñãßáò áñ÷åßïõ åîüäïõ \"%s\""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
 #
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ìåôáöñáóìÝíá ìõíÞìáôá"
 
 #
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d ìç ìåôáöñáóìÝíá ìçíýìáôá"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2151,65 +2150,65 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2217,27 +2216,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2245,33 +2244,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2279,18 +2278,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2299,56 +2298,56 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
 #
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ôï üíïìá ãéá ôç ðåñéï÷Þ \"%s\" äåí åßíáé êáôÜëëçëï ãéá üíïìá áñ÷åßïõ"
 
 #
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -2356,48 +2355,48 @@ msgstr ""
 "ãßíåé ÷ñÞóç ðñïèÝìáôïò"
 
 #
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "ç ïäçãßá `domain %s' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "ç êåíÞ åããñáöÞ `msgstr' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ç ðñïóåããéóôéêÞ åããñáöÞ `msgstr' áãíïåßôáé"
 
 #
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s: ðñïåéäïðïßçóç: ôï áñ÷åßï åéóüäïõ ðåñéÝ÷åé ðñïóåããéóôéêÝò ìåôáöñÜóåéò"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
 #
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "óöÜëìá óôçí áíÜãíùóç ôïõ \"%s\""
@@ -2576,12 +2575,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2599,14 +2598,14 @@ msgid ""
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2675,66 +2674,66 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 #
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2742,129 +2741,134 @@ msgstr[0] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
 #
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 msgstr[1] "áõôü ôï ìÞíõìá ÷ñçóéìïðïåßôáé, áëëÜ äåí ïñßæåôáé óôï %s"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 #
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí îåêéíïýí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
 #
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "Ïé åããñáöÝò `msgid' êáé `msgstr' äåí ôåëåéþíïõí êáé ïé äýï ìå '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 #
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "ìåñéêÜ ðåäßá ôçò êåöáëßäáò Ý÷ïõí áêüìá ôçí áñ÷éêÞ åî ïñéóìïý ôéìÞ"
 
 #
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "ôï ðåäßï `%s' Ý÷åé ðáñáëçöèåß áðü ôç êåöáëßäá"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 #
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "óöÜëìá óôï Üíïéãìá ôïõ \"%s\" ãéá áíÜãíùóç"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3272,7 +3276,7 @@ msgid "context separator <EOT> within string"
 msgstr ""
 
 #
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "áõôü ôï áñ÷åßï äåí ìðïñåß íá ðåñéÝ÷åé ïäçãßåò ãéá ôç ðåñéï÷Þ"
@@ -3291,44 +3295,42 @@ msgstr "áõôÞ åßíáé ç èÝóç ôïõ ðñþôïõ ïñéóìïý"
 msgid "unterminated group name"
 msgstr ""
 
-#
 #: src/read-desktop.c:286
-#, fuzzy
 msgid "invalid non-blank character"
-msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
+msgstr ""
 
 #
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "õðïëåßðïíôáé ïñßóìáôá"
 
 #
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "ìç áðïäåêôÞ óåéñÜ ÷áñáêôÞñùí äéáöõãÞò"
 
 #
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "ôï áñ÷åßï \"%s\" ìçäåíßóôçêå êáé èá ãñáöïýí äåäïìÝíá óå áõôü"
 
 #
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
 
 #
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
 
 #
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "ôï áñ÷åßï \"%s\" äåí åßíáé óôç ìïñöÞ GNU .mo"
@@ -3516,23 +3518,23 @@ msgid "compilation of C# class failed"
 msgstr ""
 
 #
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ \"%s\" ãéá åããñáöÞ"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3622,13 +3624,13 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
 #
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
@@ -3651,7 +3653,7 @@ msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3683,7 +3685,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3696,7 +3698,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíç óôáèåñÜ ÷áñáêôÞñùí"
@@ -3717,83 +3719,83 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
 #
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
 #
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "ôï --join-existing äå ìðïñåß íá ÷ñçóéìïðïéçèåß üôáí ç Ýîïäïò ãñÜöåôáé óôçí "
 "êáíïíéêÞ Ýîïäï"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
 #
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "ðñïåéäïðïßçóç: ôï áñ÷åßï `%s' ìå êáôÜëçîç `%s' åßíáé Üãíùóôï· èá äïêéìáóôåß C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 #
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "äåí äüèçêå áñ÷åßï åéóüäïõ"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3806,41 +3808,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3850,15 +3852,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3866,17 +3868,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3886,7 +3888,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3896,7 +3898,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3904,7 +3906,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3914,85 +3916,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4000,7 +4007,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4008,7 +4015,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4016,45 +4023,45 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "êáíïíéêÞ åßóïäïò"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4063,34 +4070,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4099,7 +4106,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "ç ãëþóóá `%s' åßíáé Üãíùóôç"
@@ -4203,13 +4210,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4217,7 +4224,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4225,7 +4232,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4233,7 +4240,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4241,7 +4248,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4249,23 +4256,23 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
 #
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ðñïåéäïðïßçóç: ìç ôåñìáôéóìÝíï áëöáñéèìçôéêü"
diff --git a/gettext-tools/po/en@boldquot.gmo b/gettext-tools/po/en@boldquot.gmo
index d3dbf3b..ee7be7a 100644
--- a/gettext-tools/po/en@boldquot.gmo
+++ b/gettext-tools/po/en@boldquot.gmo
diff --git a/gettext-tools/po/en@boldquot.po b/gettext-tools/po/en@boldquot.po
index b7d495a..c671564 100644
--- a/gettext-tools/po/en@boldquot.po
+++ b/gettext-tools/po/en@boldquot.po
@@ -1,7 +1,7 @@
 # English translations for gettext-tools package.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext-tools package.
-# Automatically generated, 2015.
+# Automatically generated, 2016.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.7\n"
+"Project-Id-Version: gettext-tools 0.19.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-11 22:08+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@boldquot\n"
@@ -133,7 +133,7 @@ msgid "Unknown system error"
 msgstr "Unknown system error"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -211,15 +211,15 @@ msgstr "invalid source_version argument to compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "invalid target_version argument to compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s�"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -242,39 +242,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s subprocess I/O error"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "creation of threads failed"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "write to %s subprocess failed"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "read from %s subprocess failed"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "cannot set up nonblocking I/O to %s subprocess"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "communication with %s subprocess failed"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s subprocess terminated with exit code %d"
@@ -313,18 +313,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr "setting permissions for %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "cannot create pipe"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle failed"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "cannot restore fd %d: dup2 failed"
@@ -356,11 +356,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "The element <%s> does not have attribute <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
@@ -385,7 +385,7 @@ msgstr ""
 "LOCALE from RULES and print them in a form suitable for gettext use.\n"
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -400,21 +400,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  print plural rules in the CLDR format\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  display this help and exit\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               output version information and exit\n"
@@ -424,20 +424,20 @@ msgstr "  -V, --version               output version information and exit\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -451,10 +451,10 @@ msgstr ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
@@ -485,18 +485,18 @@ msgid "extra operand %s"
 msgstr "extra operand %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error while opening “%s� for reading"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -505,19 +505,19 @@ msgstr ""
 "%s’"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "a format specification for argument %u doesn't exist in ‘%s’"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -558,8 +558,7 @@ msgstr ""
 "The string refers to argument number %u but ignores argument number %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -895,8 +894,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "format specifications in ‘%s’ are not a subset of those in ‘%s’"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
@@ -916,31 +915,31 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "In the directive number %u, ‘%c’ cannot start a field name."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "In the directive number %u, ‘%c’ cannot start a getattr argument."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 "In the directive number %u, ‘%c’ cannot start a getitem argument."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "In the directive number %u, there is an unterminated format directive."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -948,13 +947,13 @@ msgstr ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "The string refers to the argument named ‘%s’ in incompatible ways."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -962,7 +961,7 @@ msgstr ""
 "format specifications in ‘%s’ expect a mapping, those in ‘%s’ "
 "expect a tuple"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -970,7 +969,7 @@ msgstr ""
 "format specifications in ‘%s’ expect a tuple, those in ‘%s’ "
 "expect a mapping"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -978,7 +977,7 @@ msgstr ""
 "a format specification for argument '%s', as in '%s', doesn't exist in ‘"
 "%s’"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1038,7 +1037,7 @@ msgstr ""
 "1 and 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1086,11 +1085,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            addresses for the hostname\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative output:\n"
@@ -1162,12 +1161,12 @@ msgstr "the root element is not “locatingRules�"
 msgid "at most one input file allowed"
 msgstr "at most one input file allowed"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
@@ -1186,7 +1185,7 @@ msgstr ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1196,10 +1195,10 @@ msgid ""
 msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Input file location:\n"
@@ -1209,10 +1208,10 @@ msgstr "Input file location:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   input PO file\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1225,23 +1224,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "If no input file is given or if it is -, standard input is read.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Output file location:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      write output to specified file\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1252,7 +1251,7 @@ msgstr ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Message selection:\n"
@@ -1367,9 +1366,9 @@ msgid ""
 msgstr ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1393,17 +1392,17 @@ msgstr ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Output details:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1416,55 +1415,55 @@ msgstr ""
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              write PO file even if empty\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                write the .po file using indented style\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           do not write ‘#: filename:line’ lines\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1472,40 +1471,40 @@ msgstr ""
 "  -n, --add-location          generate ‘#: filename:line’ lines "
 "(default)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     write out a Java .properties file\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          set output page width\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1514,31 +1513,31 @@ msgstr ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generate sorted output\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sort output by file location\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1561,23 +1560,23 @@ msgstr ""
 "that if --use-first is specified, they will be taken from the first PO file\n"
 "to define them.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               input files\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       get list of input files from FILE\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "If input file is -, standard input is read.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1586,7 +1585,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1595,7 +1594,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1604,7 +1603,7 @@ msgstr ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1612,7 +1611,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1622,12 +1621,12 @@ msgstr ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          encoding for output\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1636,7 +1635,7 @@ msgstr ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1645,7 +1644,7 @@ msgstr ""
 "entry\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1750,19 +1749,19 @@ msgstr "this message is used but not defined in %s"
 msgid "warning: this message is not used"
 msgstr "warning: this message is not used"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "found %d fatal error"
 msgstr[1] "found %d fatal errors"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "at least two files must be specified"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1783,7 +1782,7 @@ msgstr ""
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1792,7 +1791,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1842,7 +1841,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strict Uniforum output style\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "no input file given"
@@ -2026,118 +2025,118 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "filter output is not terminated with a newline"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "the argument to %s should be a single punctuation character"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "invalid endianness: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "no input file should be given if %s and %s are specified"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requires a “-d directory� specification"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requires a “-l locale� specification"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s requires a “--template template� specification"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s requires a “-o file� specification"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s and %s are mutually exclusive in %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s is only valid with %s or %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s is only valid with %s, %s or %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "cannot locate ITS rules for %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d translated message"
 msgstr[1] "%d translated messages"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d fuzzy translation"
 msgstr[1] ", %d fuzzy translations"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d untranslated message"
 msgstr[1] ", %d untranslated messages"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage: %s [OPTION] filename.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generate binary message catalog from textual translation description.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             input files\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Operation mode:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2146,7 +2145,7 @@ msgstr ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2155,12 +2154,12 @@ msgstr ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# mode: generate a .NET .dll file\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2169,52 +2168,52 @@ msgstr ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt mode: generate a Qt .qm file\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   XML mode: generate XML file\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                enable strict Uniforum mode\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "If output file is -, output is written to standard output.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Output file location in Java mode:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource name\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2223,7 +2222,7 @@ msgstr ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2232,14 +2231,14 @@ msgstr ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2252,12 +2251,12 @@ msgstr ""
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Output file location in C# mode:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2266,7 +2265,7 @@ msgstr ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2275,18 +2274,18 @@ msgstr ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Output file location in Tcl mode:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                base directory of .msg message catalogs\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2295,22 +2294,22 @@ msgstr ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Desktop Entry mode options:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=TEMPLATE         a .desktop file used as a template\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORY                base directory of .po files\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2319,7 +2318,7 @@ msgstr ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2330,27 +2329,27 @@ msgstr ""
 "input\n"
 "files are read from the directory instead of the command line arguments.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "XML mode options:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NAME         recognise the specified XML language\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=TEMPLATE         an XML file used as a template\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Input file interpretation:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2361,13 +2360,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          check language dependent format strings\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2376,7 +2375,7 @@ msgstr ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2385,7 +2384,7 @@ msgstr ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2394,7 +2393,7 @@ msgstr ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2405,19 +2404,19 @@ msgstr ""
 "for\n"
 "                                menu items\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             use fuzzy entries in output\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2430,90 +2429,90 @@ msgstr ""
 "                                (big or little, default depends on "
 "platform)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               binary file will not include the hash table\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            print statistics about translations\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               increase verbosity level\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "warning: PO file header missing or invalid\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "warning: charset conversion will not work\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "warning: PO file header fuzzy\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "warning: older versions of msgfmt will give an error on this\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domain name “%s� not suitable as file name"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domain name “%s� not suitable as file name: will use prefix"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s does not exist"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s exists but cannot read"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s�"
@@ -2755,12 +2754,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "English translations for %s package"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "present charset “%s� is not a portable encoding name"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "two different charsets “%s� and “%s� in input file"
@@ -2782,14 +2781,14 @@ msgstr ""
 "domain “%s� in input file ‘%s’ doesn't contain a header entry "
 "with a charset specification"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "target charset “%s� is not a portable encoding name."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "warning: "
@@ -2882,25 +2881,25 @@ msgstr ""
 "Output of ‘%s’ might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "plural expression can produce negative values"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu but plural expression can produce values as large as %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "plural expression can produce division by zero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "plural expression can produce integer overflow"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2908,51 +2907,51 @@ msgstr ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Try using the following, valid for %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "message catalog has plural form translations"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "but header entry lacks a “plural=EXPRESSION� attribute"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "but header entry lacks a “nplurals=INTEGER� attribute"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "invalid nplurals value"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "invalid plural expression"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "but some messages have only one plural form"
 msgstr[1] "but some messages have only %lu plural forms"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "but some messages have one plural form"
 msgstr[1] "but some messages have %lu plural forms"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2960,98 +2959,103 @@ msgstr ""
 "message catalog has plural form translations, but lacks a header entry with "
 "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;�"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘"
 "\\n’"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘"
 "\\n’"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘"
 "\\n’"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural handling is a GNU gettext extension"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "header field ‘%s’ still has the initial default value\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "header field ‘%s’ missing in header\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "ASCII ellipsis ('...') instead of Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "space before ellipsis found in user visible strings"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "ASCII double quote used instead of Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "ASCII single quote used instead of Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII bullet ('%c') instead of Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: input is not valid in “%s� encoding"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: error while converting from “%s� encoding to “%s� encoding"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "input file doesn't contain a header entry with a charset specification"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3060,7 +3064,7 @@ msgstr ""
 "Cannot convert from “%s� to “%s�. %s relies on iconv(), and "
 "iconv() does not support this conversion."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3069,8 +3073,8 @@ msgstr ""
 "Conversion from “%s� to “%s� introduces duplicates: some "
 "different msgids become equal."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3500,7 +3504,7 @@ msgstr "end-of-line within string"
 msgid "context separator <EOT> within string"
 msgstr "context separator <EOT> within string"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
@@ -3521,31 +3525,31 @@ msgstr "unterminated group name"
 msgid "invalid non-blank character"
 msgstr "invalid non-blank character"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "missing ‘=’ after “%s�"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "invalid non-blank line"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "file “%s� is truncated"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "file “%s� contains a not NUL terminated string"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file “%s� is not in GNU .mo format"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "file “%s� contains a not NUL terminated string, at %s"
@@ -3726,23 +3730,23 @@ msgstr "compilation of C# class failed, please try --verbose"
 msgid "compilation of C# class failed"
 msgstr "compilation of C# class failed"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s� for writing"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "not a valid Java class name: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "compilation of Java class failed, please try to set $JAVAC"
@@ -3852,12 +3856,12 @@ msgstr ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: warning: unterminated string"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: warning: unterminated regular expression"
@@ -3877,7 +3881,7 @@ msgstr "%s:%d: warning: unterminated character constant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Please specify the source encoding through --from-code."
 
@@ -3917,7 +3921,7 @@ msgstr ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv failure"
@@ -3931,7 +3935,7 @@ msgstr ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: warning: invalid Unicode character"
@@ -3951,37 +3955,37 @@ msgstr "%s:%d: warning: ‘)’ found where ‘}’ was expected
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: warning: ‘}’ found where ‘)’ was expected"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "‘%s’ is not a valid encoding name.  Using ASCII as fallback.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "syntax check ‘%s’ unknown"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "sentence end type ‘%s’ unknown"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing cannot be used when output is written to stdout"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "warning: ITS rule file ‘%s’ does not exist"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -3989,17 +3993,17 @@ msgstr ""
 "warning: ITS rule file ‘%s’ does not exist; check your gettext "
 "installation"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extract translatable strings from given input files.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4008,24 +4012,24 @@ msgstr ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           write output to specified file\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choice of input file language:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4046,12 +4050,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   shorthand for --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4060,7 +4064,7 @@ msgstr ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4069,22 +4073,22 @@ msgstr ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "By default the input files are assumed to be in ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         join messages with existing file\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4099,18 +4103,18 @@ msgstr ""
 "lines\n"
 "                                in output file\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4121,17 +4125,17 @@ msgstr ""
 "                                (single-space, which is the default, \n"
 "                                 or double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language specific options:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extract all strings\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4146,7 +4150,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4161,7 +4165,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4172,7 +4176,7 @@ msgstr ""
 "argument\n"
 "                              number ARG of keyword WORD\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4187,88 +4191,93 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (only languages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=FILE              apply ITS rules from FILE\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (only XML based languages)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recognize Qt format strings\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (only language C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   recognize KDE 4 format strings\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 recognize Boost format strings\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 more detailed formatstring recognition result\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     write out a Java .properties file\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=FILE              apply ITS rules from FILE\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               write out itstool comments\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  set copyright holder in output\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  set package name in output\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  set package version in output\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4279,7 +4288,7 @@ msgstr ""
 "msgstr\n"
 "                                values\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4290,7 +4299,7 @@ msgstr ""
 "msgstr\n"
 "                                values\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4299,31 +4308,31 @@ msgstr ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Non-ASCII character at %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Non-ASCII comment at or before %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Non-ASCII string at %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: warning: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4332,7 +4341,7 @@ msgstr ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4341,7 +4350,7 @@ msgstr ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4355,7 +4364,7 @@ msgstr ""
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4365,27 +4374,27 @@ msgstr ""
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "ambiguous argument specification for keyword ‘%.*s’"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "warning: missing context for keyword ‘%.*s’"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "warning: missing context for plural argument of keyword ‘%.*s’"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "context mismatch between singular and plural form"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4397,7 +4406,7 @@ msgstr ""
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "language ‘%s’ unknown"
@@ -4510,7 +4519,7 @@ msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d: invalid interpolation (“\\U�) of 8bit character “%c�"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4518,7 +4527,7 @@ msgstr ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4529,7 +4538,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4540,7 +4549,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4551,7 +4560,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4562,7 +4571,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4573,22 +4582,22 @@ msgstr ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unknown encoding “%s�. Proceeding with ASCII instead."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: invalid string definition"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: missing number after #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: invalid string expression"
diff --git a/gettext-tools/po/en@quot.gmo b/gettext-tools/po/en@quot.gmo
index 7f90f72..f61eac7 100644
--- a/gettext-tools/po/en@quot.gmo
+++ b/gettext-tools/po/en@quot.gmo
diff --git a/gettext-tools/po/en@quot.po b/gettext-tools/po/en@quot.po
index 1c818b5..f224b06 100644
--- a/gettext-tools/po/en@quot.po
+++ b/gettext-tools/po/en@quot.po
@@ -1,7 +1,7 @@
 # English translations for gettext-tools package.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext-tools package.
-# Automatically generated, 2015.
+# Automatically generated, 2016.
 #
 # All this catalog "translates" are quotation characters.
 # The msgids must be ASCII and therefore cannot contain real quotation
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.7\n"
+"Project-Id-Version: gettext-tools 0.19.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-11 22:08+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en@quot\n"
@@ -130,7 +130,7 @@ msgid "Unknown system error"
 msgstr "Unknown system error"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -208,15 +208,15 @@ msgstr "invalid source_version argument to compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "invalid target_version argument to compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s�"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -239,39 +239,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s subprocess I/O error"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "creation of threads failed"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "write to %s subprocess failed"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "read from %s subprocess failed"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "cannot set up nonblocking I/O to %s subprocess"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "communication with %s subprocess failed"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s subprocess terminated with exit code %d"
@@ -310,18 +310,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr "setting permissions for %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "cannot create pipe"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle failed"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "cannot restore fd %d: dup2 failed"
@@ -353,11 +353,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "The element <%s> does not have attribute <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
@@ -382,7 +382,7 @@ msgstr ""
 "LOCALE from RULES and print them in a form suitable for gettext use.\n"
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -397,21 +397,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  print plural rules in the CLDR format\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  display this help and exit\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               output version information and exit\n"
@@ -421,20 +421,20 @@ msgstr "  -V, --version               output version information and exit\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -448,10 +448,10 @@ msgstr ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
@@ -482,18 +482,18 @@ msgid "extra operand %s"
 msgstr "extra operand %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error while opening “%s� for reading"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -501,19 +501,19 @@ msgstr ""
 "a format specification for argument %u, as in '%s', doesn't exist in ‘%s’"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "a format specification for argument %u doesn't exist in ‘%s’"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -552,8 +552,7 @@ msgstr ""
 "The string refers to argument number %u but ignores argument number %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "number of format specifications in ‘%s’ and ‘%s’ does not match"
@@ -881,8 +880,8 @@ msgstr "format specifications in ‘%s’ and ‘%s’ are not equivalent"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "format specifications in ‘%s’ are not a subset of those in ‘%s’"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "a format specification for argument ‘%s’ doesn't exist in ‘%s’"
@@ -901,29 +900,29 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "In the directive number %u, ‘%c’ cannot start a field name."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "In the directive number %u, ‘%c’ cannot start a getattr argument."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "In the directive number %u, ‘%c’ cannot start a getitem argument."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "In the directive number %u, there is an unterminated format directive."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -931,33 +930,33 @@ msgstr ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "The string refers to the argument named ‘%s’ in incompatible ways."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "format specifications in ‘%s’ expect a mapping, those in ‘%s’ expect a tuple"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "format specifications in ‘%s’ expect a tuple, those in ‘%s’ expect a mapping"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "a format specification for argument '%s', as in '%s', doesn't exist in ‘%s’"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1016,7 +1015,7 @@ msgstr ""
 "1 and 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1064,11 +1063,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            addresses for the hostname\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative output:\n"
@@ -1140,12 +1139,12 @@ msgstr "the root element is not “locatingRules�"
 msgid "at most one input file allowed"
 msgstr "at most one input file allowed"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
@@ -1164,7 +1163,7 @@ msgstr ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1174,10 +1173,10 @@ msgid ""
 msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Input file location:\n"
@@ -1187,10 +1186,10 @@ msgstr "Input file location:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   input PO file\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1203,23 +1202,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "If no input file is given or if it is -, standard input is read.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Output file location:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      write output to specified file\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1230,7 +1229,7 @@ msgstr ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Message selection:\n"
@@ -1344,9 +1343,9 @@ msgid ""
 msgstr ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1370,17 +1369,17 @@ msgstr ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Output details:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1393,94 +1392,94 @@ msgstr ""
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              write PO file even if empty\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                write the .po file using indented style\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           do not write ‘#: filename:line’ lines\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          generate ‘#: filename:line’ lines (default)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     write out a Java .properties file\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          set output page width\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1489,31 +1488,31 @@ msgstr ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generate sorted output\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sort output by file location\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1536,23 +1535,23 @@ msgstr ""
 "that if --use-first is specified, they will be taken from the first PO file\n"
 "to define them.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               input files\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       get list of input files from FILE\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "If input file is -, standard input is read.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1561,7 +1560,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1570,7 +1569,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1579,7 +1578,7 @@ msgstr ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1587,7 +1586,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1597,12 +1596,12 @@ msgstr ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          encoding for output\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1611,7 +1610,7 @@ msgstr ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1619,7 +1618,7 @@ msgstr ""
 "      --lang=CATALOGNAME      set ‘Language’ field in the header entry\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1724,19 +1723,19 @@ msgstr "this message is used but not defined in %s"
 msgid "warning: this message is not used"
 msgstr "warning: this message is not used"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "found %d fatal error"
 msgstr[1] "found %d fatal errors"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "at least two files must be specified"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1757,7 +1756,7 @@ msgstr ""
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1766,7 +1765,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1813,7 +1812,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strict Uniforum output style\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "no input file given"
@@ -1997,118 +1996,118 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "filter output is not terminated with a newline"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "the argument to %s should be a single punctuation character"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "invalid endianness: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "no input file should be given if %s and %s are specified"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requires a “-d directory� specification"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requires a “-l locale� specification"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s requires a “--template template� specification"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s requires a “-o file� specification"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s and %s are mutually exclusive in %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s is only valid with %s or %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s is only valid with %s, %s or %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "cannot locate ITS rules for %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d translated message"
 msgstr[1] "%d translated messages"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d fuzzy translation"
 msgstr[1] ", %d fuzzy translations"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d untranslated message"
 msgstr[1] ", %d untranslated messages"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage: %s [OPTION] filename.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generate binary message catalog from textual translation description.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             input files\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Operation mode:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2117,7 +2116,7 @@ msgstr ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2126,12 +2125,12 @@ msgstr ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# mode: generate a .NET .dll file\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2140,52 +2139,52 @@ msgstr ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt mode: generate a Qt .qm file\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   XML mode: generate XML file\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                enable strict Uniforum mode\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "If output file is -, output is written to standard output.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Output file location in Java mode:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource name\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2194,7 +2193,7 @@ msgstr ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2203,14 +2202,14 @@ msgstr ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2223,12 +2222,12 @@ msgstr ""
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Output file location in C# mode:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2237,7 +2236,7 @@ msgstr ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2246,18 +2245,18 @@ msgstr ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Output file location in Tcl mode:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                base directory of .msg message catalogs\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2266,22 +2265,22 @@ msgstr ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Desktop Entry mode options:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=TEMPLATE         a .desktop file used as a template\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORY                base directory of .po files\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2290,7 +2289,7 @@ msgstr ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2301,27 +2300,27 @@ msgstr ""
 "input\n"
 "files are read from the directory instead of the command line arguments.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "XML mode options:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NAME         recognise the specified XML language\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=TEMPLATE         an XML file used as a template\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Input file interpretation:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2332,13 +2331,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          check language dependent format strings\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2347,7 +2346,7 @@ msgstr ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2356,7 +2355,7 @@ msgstr ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2365,7 +2364,7 @@ msgstr ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2376,19 +2375,19 @@ msgstr ""
 "for\n"
 "                                menu items\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             use fuzzy entries in output\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2401,90 +2400,90 @@ msgstr ""
 "                                (big or little, default depends on "
 "platform)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               binary file will not include the hash table\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            print statistics about translations\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               increase verbosity level\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "warning: PO file header missing or invalid\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "warning: charset conversion will not work\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "warning: PO file header fuzzy\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "warning: older versions of msgfmt will give an error on this\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domain name “%s� not suitable as file name"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domain name “%s� not suitable as file name: will use prefix"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s does not exist"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s exists but cannot read"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s�"
@@ -2726,12 +2725,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "English translations for %s package"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "present charset “%s� is not a portable encoding name"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "two different charsets “%s� and “%s� in input file"
@@ -2752,14 +2751,14 @@ msgstr ""
 "domain “%s� in input file ‘%s’ doesn't contain a header entry with a charset "
 "specification"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "target charset “%s� is not a portable encoding name."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "warning: "
@@ -2852,25 +2851,25 @@ msgstr ""
 "Output of ‘%s’ might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "plural expression can produce negative values"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu but plural expression can produce values as large as %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "plural expression can produce division by zero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "plural expression can produce integer overflow"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2878,51 +2877,51 @@ msgstr ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Try using the following, valid for %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "message catalog has plural form translations"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "but header entry lacks a “plural=EXPRESSION� attribute"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "but header entry lacks a “nplurals=INTEGER� attribute"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "invalid nplurals value"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "invalid plural expression"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "but some messages have only one plural form"
 msgstr[1] "but some messages have only %lu plural forms"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "but some messages have one plural form"
 msgstr[1] "but some messages have %lu plural forms"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2930,88 +2929,93 @@ msgstr ""
 "message catalog has plural form translations, but lacks a header entry with "
 "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;�"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n’"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n’"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural handling is a GNU gettext extension"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "header field ‘%s’ still has the initial default value\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "header field ‘%s’ missing in header\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "ASCII ellipsis ('...') instead of Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "space before ellipsis found in user visible strings"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "ASCII double quote used instead of Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "ASCII single quote used instead of Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII bullet ('%c') instead of Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: input is not valid in “%s� encoding"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: error while converting from “%s� encoding to “%s� encoding"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "input file doesn't contain a header entry with a charset specification"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3020,7 +3024,7 @@ msgstr ""
 "Cannot convert from “%s� to “%s�. %s relies on iconv(), and iconv() does not "
 "support this conversion."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3029,8 +3033,8 @@ msgstr ""
 "Conversion from “%s� to “%s� introduces duplicates: some different msgids "
 "become equal."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3460,7 +3464,7 @@ msgstr "end-of-line within string"
 msgid "context separator <EOT> within string"
 msgstr "context separator <EOT> within string"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "this file may not contain domain directives"
@@ -3481,31 +3485,31 @@ msgstr "unterminated group name"
 msgid "invalid non-blank character"
 msgstr "invalid non-blank character"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "missing ‘=’ after “%s�"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "invalid non-blank line"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "file “%s� is truncated"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "file “%s� contains a not NUL terminated string"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file “%s� is not in GNU .mo format"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "file “%s� contains a not NUL terminated string, at %s"
@@ -3686,23 +3690,23 @@ msgstr "compilation of C# class failed, please try --verbose"
 msgid "compilation of C# class failed"
 msgstr "compilation of C# class failed"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s� for writing"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "not a valid Java class name: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "compilation of Java class failed, please try to set $JAVAC"
@@ -3811,12 +3815,12 @@ msgstr ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: warning: unterminated string"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: warning: unterminated regular expression"
@@ -3836,7 +3840,7 @@ msgstr "%s:%d: warning: unterminated character constant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Please specify the source encoding through --from-code."
 
@@ -3876,7 +3880,7 @@ msgstr ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv failure"
@@ -3890,7 +3894,7 @@ msgstr ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: warning: invalid Unicode character"
@@ -3910,54 +3914,54 @@ msgstr "%s:%d: warning: ‘)’ found where ‘}’ was expected"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: warning: ‘}’ found where ‘)’ was expected"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "‘%s’ is not a valid encoding name.  Using ASCII as fallback.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "syntax check ‘%s’ unknown"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "sentence end type ‘%s’ unknown"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing cannot be used when output is written to stdout"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "warning: ITS rule file ‘%s’ does not exist"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 "warning: ITS rule file ‘%s’ does not exist; check your gettext installation"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extract translatable strings from given input files.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3966,24 +3970,24 @@ msgstr ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           write output to specified file\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choice of input file language:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4004,12 +4008,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   shorthand for --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4018,7 +4022,7 @@ msgstr ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4027,22 +4031,22 @@ msgstr ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "By default the input files are assumed to be in ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         join messages with existing file\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4057,18 +4061,18 @@ msgstr ""
 "lines\n"
 "                                in output file\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4079,17 +4083,17 @@ msgstr ""
 "                                (single-space, which is the default, \n"
 "                                 or double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language specific options:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extract all strings\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4104,7 +4108,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4119,7 +4123,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4130,7 +4134,7 @@ msgstr ""
 "argument\n"
 "                              number ARG of keyword WORD\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4145,88 +4149,93 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (only languages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=FILE              apply ITS rules from FILE\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (only XML based languages)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recognize Qt format strings\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (only language C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   recognize KDE 4 format strings\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 recognize Boost format strings\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 more detailed formatstring recognition result\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     write out a Java .properties file\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=FILE              apply ITS rules from FILE\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               write out itstool comments\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  set copyright holder in output\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  set package name in output\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  set package version in output\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4237,7 +4246,7 @@ msgstr ""
 "msgstr\n"
 "                                values\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4248,7 +4257,7 @@ msgstr ""
 "msgstr\n"
 "                                values\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4257,31 +4266,31 @@ msgstr ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Non-ASCII character at %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Non-ASCII comment at or before %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Non-ASCII string at %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: warning: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4290,7 +4299,7 @@ msgstr ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4299,7 +4308,7 @@ msgstr ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4312,7 +4321,7 @@ msgstr ""
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4322,27 +4331,27 @@ msgstr ""
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "ambiguous argument specification for keyword ‘%.*s’"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "warning: missing context for keyword ‘%.*s’"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "warning: missing context for plural argument of keyword ‘%.*s’"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "context mismatch between singular and plural form"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4354,7 +4363,7 @@ msgstr ""
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "language ‘%s’ unknown"
@@ -4463,7 +4472,7 @@ msgstr "%s:%d: invalid interpolation (“\\L�) of 8bit character “%c�"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: invalid interpolation (“\\U�) of 8bit character “%c�"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4471,7 +4480,7 @@ msgstr ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4482,7 +4491,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4493,7 +4502,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4504,7 +4513,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4515,7 +4524,7 @@ msgstr ""
 "Please specify the correct source encoding through --from-code or through a\n"
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4526,22 +4535,22 @@ msgstr ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unknown encoding “%s�. Proceeding with ASCII instead."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: invalid string definition"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: missing number after #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: invalid string expression"
diff --git a/gettext-tools/po/es.gmo b/gettext-tools/po/es.gmo
index 029dbbd..b09f3c2 100644
--- a/gettext-tools/po/es.gmo
+++ b/gettext-tools/po/es.gmo
diff --git a/gettext-tools/po/es.po b/gettext-tools/po/es.po
index 4a6c846..315034b 100644
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19.6.43\n"
+"Project-Id-Version: GNU gettext-tools 0.19.7-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-13 10:15+0100\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2015-12-31 00:56+0100\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
 "Language: es\n"
@@ -111,7 +111,7 @@ msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -189,15 +189,15 @@ msgstr "argumento source_version no válido para compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argumento target_version no válido para compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "fallo al crear \"%s\""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -223,39 +223,39 @@ msgid "%s subprocess I/O error"
 msgstr "error de E/S en el subproceso %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "Memoria agotada"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "fallo al crear hilos de ejecución"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "fallo en la escritura la subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "fallo en la lectura del subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "no se puede eliminar el bloqueo de la E/S del subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "fallo en la comunicación con el subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "el subproceso %s terminó con un código de salida %d"
@@ -294,18 +294,18 @@ msgstr "»"
 msgid "setting permissions for %s"
 msgstr "configurando permisos para %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "no se puede crear la tubería"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "fallo en _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "no se puede restaurar fd %d: fallo en dup2"
@@ -322,9 +322,9 @@ msgid "%s subprocess got fatal signal %d"
 msgstr "el subproceso %s ha recibido una señal fatal %d"
 
 #: src/cldr-plurals.c:69
-#, fuzzy, c-format
+#, c-format
 msgid "The root element must be <%s>"
-msgstr "el elemento raíz no es \"locatingRules\""
+msgstr "El elemento raíz debe ser <%s>"
 
 #: src/cldr-plurals.c:83
 #, c-format
@@ -337,11 +337,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "El elemento <%s> no tiene un atributo <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pruebe '%s --help' para más información.\n"
@@ -366,7 +366,7 @@ msgstr ""
 "para la REGIÓN en REGLAS y las imprime en un formato adecuado para gettext.\n"
 "Si no se pone ningún argumento, lee las reglas de plurales CLDR de la entradaestándar.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -383,21 +383,21 @@ msgstr ""
 "CLDR\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  muestra esta ayuda y finaliza\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               muestra la versión y finaliza\n"
@@ -407,20 +407,20 @@ msgstr "  -V, --version               muestra la versión y finaliza\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -434,10 +434,10 @@ msgstr ""
 "SIN NINGUNA GARANT�A, dentro de los límites legales.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -468,18 +468,18 @@ msgid "extra operand %s"
 msgstr "operando extra %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -488,19 +488,19 @@ msgstr ""
 "en '%s'"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento %u no existe en '%s'"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -544,8 +544,7 @@ msgstr ""
 "%u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "el número de especificaciones de formato en `%s' y '%s' no coincide"
@@ -888,8 +887,8 @@ msgstr ""
 "las especificaciones de formato en '%s' no son un subconjunto de las que hay "
 "en '%s'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento '%s' no existe en '%s'"
@@ -908,19 +907,19 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "En la instrucción número %u, '%c' no puede iniciar un nombre de campo."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "En la instrucción número %u, '%c' no puede iniciar un argumento de getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 "En la instrucción número %u, '%c' no puede iniciar un argumento de getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -928,12 +927,12 @@ msgstr ""
 "En la instrucción número %u, no se permite más anidamiento en un "
 "especificador de formato."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "En la instrucción número %u, hay una instrucción de formato inacabada."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -941,13 +940,13 @@ msgstr ""
 "La cadena se refiere a ambos argumentos a través de números de argumento "
 "absolutos y a través de especificaciones de argumentos no numerados."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "La cadena se refiere al argumento denominado '%s' en formas incompatibles."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -955,7 +954,7 @@ msgstr ""
 "las especificaciones de formato en '%s' requieren una asociación, y aquellas "
 "en '%s' requieren una tupla"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -963,7 +962,7 @@ msgstr ""
 "las especificaciones de formato en '%s' requieren una tupla y aquellas en "
 "'%s' requieren una asociación"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -971,7 +970,7 @@ msgstr ""
 "una especificación de formato para el argumento '%s', como en '%s', no "
 "existe en '%s'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1030,7 +1029,7 @@ msgstr ""
 "El carácter que termina la instrucción número %u no es un dígito entre 1 y 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1079,11 +1078,11 @@ msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 "  -i, --ip-address            direcciones para el nombre de la máquina\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Salida informativa:\n"
@@ -1155,12 +1154,12 @@ msgstr "el elemento raíz no es \"locatingRules\""
 msgid "at most one input file allowed"
 msgstr "solo se permite un fichero de entrada máximo"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s y %s son mutuamente excluyentes"
@@ -1179,7 +1178,7 @@ msgstr ""
 "Filtra los mensajes de un catálogo de traducción de acuerdo con sus\n"
 "atributos, y luego manipula los atributos.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1191,10 +1190,10 @@ msgstr ""
 "obligatorios para las opciones cortas.\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Localización del fichero de entrada:\n"
@@ -1204,10 +1203,10 @@ msgstr "Localización del fichero de entrada:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHEROENTRADA              fichero PO de entrada\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1224,24 +1223,24 @@ msgstr ""
 "Si no se especifica un fichero de entrada o si es -, se lee la entrada "
 "estándar.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Localización del fichero de salida:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FICHERO   escribe la salida al FICHERO especificado\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1252,7 +1251,7 @@ msgstr ""
 "Los resultados se escriben a la salida estándar si no se especifica ningún\n"
 "fichero de salida o si es -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selección de mensaje:\n"
@@ -1382,9 +1381,9 @@ msgid ""
 msgstr ""
 "      --obsolete              sinónimo de --only-obsolete --clean-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1409,17 +1408,17 @@ msgstr ""
 "      --stringtable-input     el fichero de entrada sigue la sintaxis de ."
 "strings de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalles de salida:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1432,18 +1431,18 @@ msgstr ""
 "      --color=CUANDO          utiliza colores y otros atributos de texto si "
 "se cumple CUANDO.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=FICHEROESTILO   especifica fichero de reglas de estilo CSS "
 "para --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1451,9 +1450,9 @@ msgstr ""
 "  -e, --no-escape             no utiliza escapes de C en la salida (por "
 "omisión)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1461,31 +1460,31 @@ msgstr ""
 "  -E, --escape                utiliza escapes de C en la salida, sin "
 "caracteres extendidos\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              escribe un fichero PO aún si está vacío\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                escribe el fichero .po utilizando estilo con "
 "sangrados\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           no escribe las líneas '#: fichero:línea'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1493,24 +1492,24 @@ msgstr ""
 "  -n, --add-location          genera líneas '#: fichero:línea' (por "
 "omisión)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                escribe un fichero .po con Uniforum estricto\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     escribe un fichero .properties de Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1518,16 +1517,16 @@ msgstr ""
 "      --stringtable-output    escribe un fichero .strings de NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NÚMERO          pone la anchura de la página de salida\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1538,32 +1537,32 @@ msgstr ""
 "                              sean mayores a la anchura de la página de "
 "salida\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera una salida ordenada\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          ordena la salida por ubicación de fichero\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "se especificó un criterio de selección imposible (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1587,25 +1586,25 @@ msgstr ""
 "se especifica --use-first, en cuyo caso serán tomados del primer\n"
 "fichero PO para definirlos.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHEROENTRADA ...          ficheros de entrada\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FICHERO    obtiene una lista de ficheros de entrada del "
 "FICHERO\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Si el fichero de entrada es -, se lee la entrada estándar.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1616,7 +1615,7 @@ msgstr ""
 "                              definiciones; si no se especifica, es "
 "infinito\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1626,7 +1625,7 @@ msgstr ""
 "de\n"
 "                              definiciones; si no se pone, utiliza 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1635,7 +1634,7 @@ msgstr ""
 "  -u, --unique                abreviatura de --less-than=2, solicita\n"
 "                              que solo se impriman los mensajes únicos\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1644,7 +1643,7 @@ msgstr ""
 "  -P, --properties-input      los ficheros de entrada siguen la misma "
 "sintaxis que .properties de Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1654,12 +1653,12 @@ msgstr ""
 "      --stringtable-input     los ficheros de entrada están en la sintaxis\n"
 "                              .strings de NeXTstep/GNUstep.\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOMBRE        codificación de la salida\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1668,7 +1667,7 @@ msgstr ""
 "      --use-first             utiliza la primera traducción disponible para\n"
 "                              cada mensaje, no mezcla varias traducciones\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1676,7 +1675,7 @@ msgstr ""
 "      --lang=NOMBRECATALOGO   pone el campo 'Language' en la cabecera\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1867,19 +1866,19 @@ msgstr "atención: este mensaje no se utiliza"
 #
 # 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
 # aventura. Quizá no sea tan malo como dice Enrique, a menos que...
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "se encontró %d error fatal"
 msgstr[1] "se encontraron %d errores fatales"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "se deben especificar por lo menos dos ficheros"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1902,7 +1901,7 @@ msgstr ""
 "defina. Las posiciones dentro del fichero de todos los ficheros PO se\n"
 "acumularán.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1913,7 +1912,7 @@ msgstr ""
 "                              sea mayor que NÚMERO; si no se pone,\n"
 "                              el valor por omisión es 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1967,7 +1966,7 @@ msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "no se especificó el fichero de entrada"
@@ -2161,119 +2160,119 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "la salida del filtro no termina con una nueva línea"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "el argumento a %s debe ser un solo carácter de puntuación"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "«Endianness» no válida: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "no debería especificarse fichero de entrada si se especifican %s y %s"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requiere que se especifique un \"-d directorio\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requiere que se especifique un \"-l locale\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s requiere que se especifique un \"--template plantilla\""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s requiere que se especifique un \"-o fichero\""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s y %s son mutuamente excluyentes en %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s solo es válido con %s o %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s solo es válido con %s, %s o %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "no se pueden ubicar las reglas ITS para %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaje traducido"
 msgstr[1] "%d mensajes traducidos"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducción difusa"
 msgstr[1] ", %d traducciones difusas"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensaje sin traducir"
 msgstr[1] ", %d mensajes sin traducir"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genera un catálogo binario de mensajes a partir de la descripción de la "
 "traducción textual.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichero.po ...              ficheros de entrada\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operación:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2282,7 +2281,7 @@ msgstr ""
 "  -j, --java                  Modo Java: la entrada es una clase de Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2291,13 +2290,13 @@ msgstr ""
 "      --java2                 como --java, y supone el uso de Java2\n"
 "                              (JDK 1.2 o superior)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                Modo C#: genera un fichero .dll de .NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2306,19 +2305,19 @@ msgstr ""
 "      --csharp-resources      modo de recursos C#: genera un fichero ."
 "resources de .NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Modo tcl: genera un fichero .msg tcl/msgcat\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Modo Qt: genera un fichero .qm de Qt\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2326,33 +2325,33 @@ msgstr ""
 "      --desktop               Modo entrada de escritorio: genera un fichero ."
 "desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   Modo XML: genera un fichero XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Si el fichero de salida es -,  se escribe en la salida estándar.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Localización del fichero de salida en modo Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURSO      nombre del recurso\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2360,7 +2359,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOCAL          nombre local, ya sea idioma o idioma_PAIS\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2369,14 +2368,14 @@ msgstr ""
 "      --source                produce un fichero .java en lugar de un "
 "fichero .class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORIO               directorio base de la jerarquía de clases\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2388,12 +2387,12 @@ msgstr ""
 "recurso, separados por un guión bajo. La opción -d es obligatoria. La clase\n"
 "se escribe bajo el directorio especificado.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Localización del fichero de salida en modo C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2402,7 +2401,7 @@ msgstr ""
 "  -d DIRECTORIO               directorio base de los ficheros .dll de "
 "dependencias locales\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2412,19 +2411,19 @@ msgstr ""
 "un subdirectorio del directorio especificado cuyo nombre dependerá de la "
 "localización.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Localización del fichero de salida en modo Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORIO               directorio base de los catálogos de\n"
 "                              mensajes .msg\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2433,23 +2432,23 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Opciones del modo de entrada de escritorio:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "  --template=PLANTILLA        un fichero .desktop utilizado como plantilla\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORIO               directorio base de los ficheros .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2459,7 +2458,7 @@ msgstr ""
 "adicional\n"
 "  -k, --keyword               no usa las palabras clave por omisión\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2471,27 +2470,27 @@ msgstr ""
 "entrada se leen del directorio en lugar de los argumentos de la línea de "
 "órdenes.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Opciones del modo XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L  --language=NOMBRE       reconoce el lenguaje XML especificado\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=PLANTILLA        fichero XML utilizado como plantilla\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretación del fichero de entrada:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2502,7 +2501,7 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
@@ -2510,7 +2509,7 @@ msgstr ""
 "del\n"
 "                              idioma\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2519,7 +2518,7 @@ msgstr ""
 "      --check-header          verifica la presencia y contenido de la\n"
 "                              línea de encabezado\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2529,7 +2528,7 @@ msgstr ""
 "instrucciones\n"
 "                              del dominio y la opción --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2539,7 +2538,7 @@ msgstr ""
 "el\n"
 "                              msgfmt de X/Open\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2549,13 +2548,13 @@ msgstr ""
 "      --check-accelerators[=CAR]   revisa la presencia de aceleradores de\n"
 "                                   teclado para los elementos del menú\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             utiliza entradas difusas para la salida\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2563,7 +2562,7 @@ msgstr ""
 "   -a, --alignment=NÚMERO      alinea las cadenas al NÚMERO de bytes\n"
 "                               (por omisión es: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2576,7 +2575,7 @@ msgstr ""
 "                                (que el «endianness» predefinido sea «big» o "
 "«little» depende de la plataforma)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2584,52 +2583,52 @@ msgstr ""
 "      --no-hash               el fichero binario no incluirá la tabla de "
 "hash\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            muestra las estadísticas sobre las "
 "traducciones\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta la cantidad de mensajes\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "atención: el encabezado del fichero PO no existe o es inválido\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "atención: la conversión del conjunto de caracteres no funcionará\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "atención: el encabezado del fichero PO está difuso\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "atención: las versiones anteriores de msgfmt producirán un error en esto\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "el nombre del dominio \"%s\" no es válido como nombre de fichero:\n"
 "se utilizará un prefijo"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "la instrucción 'domain %s' no tiene efecto"
@@ -2638,40 +2637,40 @@ msgstr "la instrucción 'domain %s' no tiene efecto"
 # Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
 # Sugerencia: Descartar. sv
 # Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "se descarta la línea vacía 'msgstr'"
 
 # Lo mismo. sv
 # Ok. mm
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "se descarta la línea difusa 'msgstr'"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s no existe"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existe pero no se puede leer"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error al leer \"%s\""
@@ -2930,14 +2929,14 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traducciones al español para el paquete %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "el conjunto de caracteres actual \"%s\" no es un nombre de codificación "
 "portátil"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2961,7 +2960,7 @@ msgstr ""
 "el dominio \"%s\" en el fichero de entrada '%s' no contiene una línea de "
 "encabezado con la especificación del conjunto de caracteres"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
@@ -2970,7 +2969,7 @@ msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "atención: "
@@ -3064,26 +3063,26 @@ msgstr ""
 "La salida de '%s' podría ser incorrecta.\n"
 "Una alternativa posible s poner LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "la expresión plural puede producir resultados negativos"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu pero las expresiones plurales pueden producir valores tan "
 "grades como %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "la expresión plural puede producir una división por cero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "la expresión plural puede producir desbordamiento de número entero"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -3091,51 +3090,51 @@ msgstr ""
 "la expresión plural puede producir excepciones aritméticas, posiblemente una "
 "división por cero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Pruebe utilizando lo siguiente, válido para %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "el catálogo de mensajes tiene formas plurales en las traducciones"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "valor inválido de nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "expresión plural inválida"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "pero algunos mensajes solo tienen una forma plural"
 msgstr[1] "pero algunos mensajes solo tienen %lu formas plurales"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "pero algunos mensajes tienen una forma plural"
 msgstr[1] "pero algunos mensajes tienen %lu formas plurales"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -3159,7 +3158,7 @@ msgstr ""
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "las líneas 'msgid' y 'msgid_plural' no comienzan ambas con '\\n'"
 
@@ -3179,7 +3178,7 @@ msgstr "las líneas 'msgid' y 'msgid_plural' no comienzan ambas con '\\n'"
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "las líneas 'msgid' y 'msgstr[%u]' no comienzan ambas con '\\n'"
@@ -3200,90 +3199,95 @@ msgstr "las líneas 'msgid' y 'msgstr[%u]' no comienzan ambas con '\\n'"
 # Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
 # Si no se te ocurre nada mejor, sugerencia:
 # "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "las líneas 'msgid' y 'msgstr' no comienzan ambas con '\\n'"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "las líneas 'msgid' y 'msgid_plural' no terminan ambas con '\\n'"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "las líneas 'msgid' y 'msgstr[%u]' no terminan ambas con '\\n'"
 
 # Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
 # y la otra no, así de sencillo. sv+
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "las líneas 'msgid' y 'msgstr' no terminan ambas con '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "el manejo del plural es una extensión del gettext de GNU"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "el campo de cabecera '%s' aún tiene el valor inicial por omisión\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "el campo '%s' no está presente en la cabecera\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "puntos suspensivos ASCII ('...') en lugar de Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 "se ha encontrado un espacio delante de unos puntos suspensivos en cadenas\n"
 "que el usuario puede ver"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "se han utilizado comillas dobles ASCII en lugar de Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "se han utilizado comillas simples ASCII en lugar de Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, fuzzy, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "puntos suspensivos ASCII ('...') en lugar de Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: la entrada no es válida con la codificación \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: error al convertir de la codificación \"%s\" a la codificación \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "El fichero de entrada no contiene una línea de encabezado que especifique el "
 "conjunto de caracteres"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3292,7 +3296,7 @@ msgstr ""
 "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv() "
 "no soporta este tipo de conversión."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3301,8 +3305,8 @@ msgstr ""
 "La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
 "distintos se vuelven iguales."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3813,7 +3817,7 @@ msgstr "separador de contexto <EOT> dentro de una cadena"
 # mente el verbo poder en Castellano es mucho más flexible que en otros
 # idiomas. De todas maneras siempre se puede mirar otras traducciones.  em
 # ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este fichero no puede contener instrucciones de dominio"
@@ -3835,31 +3839,31 @@ msgstr "nombre de grupo sin terminar"
 msgid "invalid non-blank character"
 msgstr "carácter «no espacio» no válido"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "falta '=' después de \"%s\""
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "línea «no vacía» no válida"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "el fichero \"%s\" está truncado"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "el fichero \"%s\" no está en el formato .mo de GNU"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL en %s"
@@ -4041,24 +4045,24 @@ msgstr "fallo en la compilación de la clase C#, intente --verbose"
 msgid "compilation of C# class failed"
 msgstr "fallo en la compilación de la clase C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error al abrir el fichero \"%s\" para escritura"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "no es un nombre de clase Java válido: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "fallo en la compilación de la clase Java, intente poner $JAVAC"
@@ -4171,12 +4175,12 @@ msgstr ""
 "el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
 "catálogo de mensajes de Tcl no soporta el trato plural\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: atención: cadena no finalizada"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: atención: expresión regular no finalizada"
@@ -4196,7 +4200,7 @@ msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: atención: literal de cadena no finalizada"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Especifique la codificación del código fuente utilizando --from-code."
 
@@ -4236,7 +4240,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: fallo en iconv"
@@ -4250,7 +4254,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte inválida.\n"
 "Especifique la codificación del código fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: atención: carácter Unicode inválido"
@@ -4270,41 +4274,41 @@ msgstr "%s:%d: cuidado: se encontró un ')' en donde se esperaba un '}'"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: cuidado: se encontró un '}' en donde se esperaba un ')'"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 "'%s' no es un nombre de codificación válido.  Se utilizará ASCII en su "
 "lugar.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "comprobación de sintaxis '%s' desconocida"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "tipo de fin de instrucción '%s' desconocido"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "no se puede utilizar --join-existing cuando el resultado se escribe en la\n"
 "salida estándar (stdout)"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext no puede funcionar sin palabras claves que buscar"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "atención: el fichero de reglas ITS '%s' no existe"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -4312,20 +4316,20 @@ msgstr ""
 "atención: el fichero de reglas ITS '%s' no existe; compruebe su instalación "
 "de gettext"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "atención: el fichero '%s' con extensión '%s'\n"
 "es desconocido; se intentará tipo C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4334,13 +4338,13 @@ msgstr ""
 "  -d, --default-domain=NOMBRE utiliza NOMBRE.po para la salida (en vez de\n"
 "                              mensajes.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FICHERO        escribe la salida al fichero especificado\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4349,12 +4353,12 @@ msgstr ""
 "                              directorio DIR\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selección del lenguaje del fichero de entrada:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4375,12 +4379,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abreviatura de --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4389,7 +4393,7 @@ msgstr ""
 "Por omisión, el lenguaje se adivina dependiendo de la extensión del fichero "
 "de entrada.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4398,25 +4402,25 @@ msgstr ""
 "      --from-code=NOMBRE      codifica a partir de los ficheros de entrada\n"
 "                                (excepto para Python, Tcl y Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Por omisión, los ficheros de entrada se presupone que están en ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         une los mensajes con un fichero existente\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FICHERO.po  las líneas del FICHERO.po no son extraidas\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4432,19 +4436,19 @@ msgstr ""
 "  -c, --add-comments          coloca todos los bloques de comentarios "
 "delante de las líneas de palabras clave\n"
 
-#: src/xgettext.c:1117
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NOMBRE          comprueba la sintaxis de los mensajes\n"
 "                                (puntos suspensivos unicode, espacio\n"
 "                                 delante de puntos suspensivos,\n"
 "                                 comillas unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4455,17 +4459,17 @@ msgstr ""
 "                                (predefinido un espacio sencillo, \n"
 "                                 o un espacio doble)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opciones específicas del lenguaje:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrae todas las cadenas\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4481,7 +4485,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4497,7 +4501,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4510,7 +4514,7 @@ msgstr ""
 "palabra\n"
 "                                  clave PALABRA\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4526,40 +4530,51 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs              entiende los trígrafos de ANSI C para la\n"
 "                               entrada\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (solo en lenguajes C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"      --its=FICHERO           aplica las reglas ITS obtenidas de FICHERO\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (solo lenguaje C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (solo lenguaje C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   reconoce los 4 formatos de cadena KDE\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 reconoce los formatos de cadena Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4568,29 +4583,23 @@ msgstr ""
 "reconocimiento\n"
 "                              de las cadenas de formato\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     escribe un fichero .properties de Java\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"      --its=FICHERO           aplica las reglas ITS obtenidas de FICHERO\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               escribe comentarios itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=CADENA  pone al dueño del copyright en la salida\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4598,19 +4607,19 @@ msgstr ""
 "      --foreign-user          omite el copyright de la FSF en la salida\n"
 "                              para los usuarios extranjeros\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 "      --package-name=PAQUETE  pone el nombre del paquete en la salida\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSION  pone la versión del paquete en la salida\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4618,7 +4627,7 @@ msgstr ""
 "      --msgid-bugs-address=DIRECCION@DECORREO  pone la dirección de correo \n"
 "                                               para reportar los errores\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4629,7 +4638,7 @@ msgstr ""
 "para las\n"
 "                                  líneas del msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4640,7 +4649,7 @@ msgstr ""
 "para las\n"
 "                                líneas del msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4649,31 +4658,31 @@ msgstr ""
 "Un argumento --flag no tiene la sintaxis <palabraclave>:<númarg>:"
 "[pass-]<bandera>: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Carácter no ASCII en %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Comentario no ASCII en o precediendo %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Cadena no ASCII en %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: atención: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4682,7 +4691,7 @@ msgstr ""
 "Aunque se utilizó en una posición de formato de cadena, el %s no se un "
 "formato de cadena válido %s. La razón es: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4691,7 +4700,7 @@ msgstr ""
 "Aunque así esté declarado, '%s' no es un formato de cadena válido %s. Razón: "
 "%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4705,7 +4714,7 @@ msgstr ""
 "Considere la opción de usar una cadena de formato con argumentos con nombre\n"
 "y una asociación en lugar de una tupla para los argumentos.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4715,29 +4724,29 @@ msgstr ""
 "gettext(\"\") regresa la línea de encabezado con la\n"
 "metainformación, no una cadena vacía.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "la especificación de argumento es ambigua para la palabra clave '%.*s'"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "atención: no está presente el contexto para la palabra clave '%.*s'"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "atención: no está presente el contexto para el argumento plural de la "
 "palabra clave '%.*s'"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "discordancia de contexto entre las formas de singular y plural"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4749,7 +4758,7 @@ msgstr ""
 "allí la variable MSGID_BUGS_ADDRESS; en caso contrario,\n"
 "debe especificar la opción de línea de órdenes --msgid-bugs-address\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "idioma '%s' desconocido"
@@ -4864,7 +4873,7 @@ msgstr "%s%d: interpolación no válida (\"\\L\") del caracter de 8 bits \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolación no válida (\"\\U\") del caracter de 8 bits \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4873,7 +4882,7 @@ msgstr ""
 "mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4885,7 +4894,7 @@ msgstr ""
 "code o mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4897,7 +4906,7 @@ msgstr ""
 "code o mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4909,7 +4918,7 @@ msgstr ""
 "code o mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4921,7 +4930,7 @@ msgstr ""
 "code o mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4933,22 +4942,22 @@ msgstr ""
 "mediante un comentario\n"
 "como se indica en http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Codificación desconocida \"%s\". Se procederá con ASCII en su lugar."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definición de cadena inválida"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: falta un número después del símbolo #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expresión de cadena inválida"
diff --git a/gettext-tools/po/et.gmo b/gettext-tools/po/et.gmo
index ab49d07..e6a0856 100644
--- a/gettext-tools/po/et.gmo
+++ b/gettext-tools/po/et.gmo
diff --git a/gettext-tools/po/et.po b/gettext-tools/po/et.po
index 139e97d..05f2f13 100644
--- a/gettext-tools/po/et.po
+++ b/gettext-tools/po/et.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2001-04-30 16:25+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -106,7 +106,7 @@ msgid "Unknown system error"
 msgstr "Tundmatu süsteemne viga"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -120,7 +120,7 @@ msgstr "%s: võti `%s' on mitmetähenduslik\n"
 #: gnulib-lib/getopt.c:619
 #, fuzzy, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: võti `-W %s' on mitmetähenduslik\n"
+msgstr "%s: võti `%s' on mitmetähenduslik\n"
 
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
 #, fuzzy, c-format
@@ -184,15 +184,15 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -215,39 +215,39 @@ msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "mälu sai otsa"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -286,18 +286,18 @@ msgstr ""
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "ei suuda luua väljundfaili \"%s\""
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "ei suuda luua väljundfaili \"%s\""
@@ -329,11 +329,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Täiendava info saamiseks proovi `%s --help'.\n"
@@ -353,7 +353,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -366,21 +366,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr ""
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -390,21 +390,21 @@ msgstr ""
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -414,10 +414,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Selle programmi on kirjutanud %s.\n"
@@ -448,37 +448,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -512,8 +512,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
@@ -802,8 +801,8 @@ msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
@@ -820,57 +819,57 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -918,7 +917,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -963,11 +962,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
@@ -1039,12 +1038,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "vaja läheb täpselt kahte sisendfaili"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s on vastastikku välistavad"
@@ -1061,7 +1060,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1070,10 +1069,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "sisendfail on määramata"
@@ -1083,10 +1082,10 @@ msgstr "sisendfail on määramata"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1098,23 +1097,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1123,7 +1122,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -1228,9 +1227,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1251,17 +1250,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1270,87 +1269,87 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1371,31 +1370,31 @@ msgstr ""
 "  -V, --version            väljastab versiooniinfo ja lõpetab programmi töö\n"
 "  -w, --width=NUMBER       määrab väljastatava lehekülje laiuse\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1423,51 +1422,51 @@ msgstr ""
 "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n"
 "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1475,26 +1474,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1606,19 +1605,19 @@ msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgid "warning: this message is not used"
 msgstr "hoiatus: see teade on kasutamata"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "leitud %d tõsine viga"
 msgstr[1] "leitud %d tõsist viga"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "vähemalt kaks faili peab olema ette antud"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1645,14 +1644,14 @@ msgstr ""
 "comments) jäetakse alles ainult esimesena kirjeldatud PO failist.\n"
 "Positsioonikirjeldused võetakse ja säilitatakse kõikidest PO failidest.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1697,7 +1696,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "sisendfail on määramata"
@@ -1859,206 +1858,206 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s ja %s on vastastikku välistavad"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "ei suuda luua väljundfaili \"%s\""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d tõlgitud teade"
 msgstr[1] "%d tõlgitud teadet"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d kahtlane tõlge"
 msgstr[1] ", %d kahtlast tõlget"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d tõlkimata teade"
 msgstr[1] ", %d tõlkimata teadet"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2067,65 +2066,65 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "sisendfail on määramata"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2133,27 +2132,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2161,33 +2160,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2195,18 +2194,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2215,95 +2214,95 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
 "%*s  hoiatus: charset conversion will not work"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Kooditabel on päises kirjeldamata.\n"
 "Tõlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: hoiatus: PO faili päis puudub, on kahtlane või vigane\n"
 "%*s  hoiatus: charset conversion will not work"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena: kasutan eesliidet"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "ignoreerin `domain %s' direktiivi"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "ignoreerin tühja `msgstr' kirjet"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ignoreerin kahtlast `msgstr' kirjet"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: hoiatus: lähtefail sisaldab kahtlast tõlget"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
@@ -2482,12 +2481,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2505,14 +2504,14 @@ msgid ""
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: hoiatus: "
@@ -2581,167 +2580,172 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 msgstr[1] "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgst_plural' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgstr' kirjed ei alga sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgst_plural' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgstr' kirjed ei lõppe sarnaselt märgiga '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "mõned päise kirjes olevad väljad sisaldavad ikka veel algseid väärtusi"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "päise kirjest on puudu väli `%s'"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2750,15 +2754,15 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3156,7 +3160,7 @@ msgstr "reavahetus asub stringi sees"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "see fail ei tohi sisaldada domeeni direktiive"
@@ -3175,36 +3179,35 @@ msgid "unterminated group name"
 msgstr ""
 
 #: src/read-desktop.c:286
-#, fuzzy
 msgid "invalid non-blank character"
-msgstr "%s:%d: lõpetamata sümbolkonstant"
+msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "argumendid on puudu"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "vigane juhtjada"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "faili \"%s\" sai kärbitud"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fail \"%s\" ei ole GNU .mo vormingus"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "fail \"%s\" sisaldab stringi, mis ei lõpe koodiga NUL"
@@ -3376,23 +3379,23 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3476,12 +3479,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: hoiatus: lõpetamata string"
@@ -3501,7 +3504,7 @@ msgstr "%s:%d: lõpetamata sümbolkonstant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: hoiatus: lõpetamata string"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3533,7 +3536,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3545,7 +3548,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: lõpetamata sümbolkonstant"
@@ -3565,78 +3568,78 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "tundmatu keel `%s'"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "võtit `--join-existing' ei ole võimalik pruukida kui väljunit kirjutatakse "
 "standardväljundisse"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ei tööta ilma vajalike võtmesõnadeta"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "hoiatus: faili `%s' laiend `%s' on tundmatu; proovin C vormingut"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "sisendfail on määramata"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3649,41 +3652,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3693,15 +3696,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3709,17 +3712,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3729,7 +3732,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3739,7 +3742,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3747,7 +3750,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3757,85 +3760,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3843,7 +3851,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3851,52 +3859,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standardsisend"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: hoiatus: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3905,34 +3913,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3940,7 +3948,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "tundmatu keel `%s'"
@@ -4039,13 +4047,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4053,7 +4061,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4061,7 +4069,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4069,7 +4077,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4077,7 +4085,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4085,22 +4093,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: hoiatus: lõpetamata string"
@@ -4245,14 +4253,6 @@ msgstr ""
 msgid "document ended unexpectedly: %s"
 msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Language \"glade\" is not supported. %s relies on expat.\n"
-#~ "This version was built without expat.\n"
-#~ msgstr ""
-#~ "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
-#~ "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: lubamatu võti -- %c\n"
 
@@ -4264,6 +4264,14 @@ msgstr ""
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "väli `%s' sisaldab ikka veel algset väärtust"
 
+#, fuzzy
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
+#~ "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
+
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
diff --git a/gettext-tools/po/eu.gmo b/gettext-tools/po/eu.gmo
index 04b60d3..f7497f7 100644
--- a/gettext-tools/po/eu.gmo
+++ b/gettext-tools/po/eu.gmo
diff --git a/gettext-tools/po/eu.po b/gettext-tools/po/eu.po
index 1962977..1869388 100644
--- a/gettext-tools/po/eu.po
+++ b/gettext-tools/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2007-08-31 11:36+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -109,7 +109,7 @@ msgid "Unknown system error"
 msgstr "Sistema errore ezezaguna"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -123,7 +123,7 @@ msgstr "%s: `%s' aukera anbiguoa da\n"
 #: gnulib-lib/getopt.c:619
 #, fuzzy, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: `-W %s' aukera anbiguoa da\n"
+msgstr "%s: `%s' aukera anbiguoa da\n"
 
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
 #, fuzzy, c-format
@@ -187,15 +187,15 @@ msgstr "source_version argumentu baliogabea compile_java_class-rentzat"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "target_version argumentu baliogabea compile_java_class-rentzat"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Huts \"%s\" sortzerakoan"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -221,39 +221,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s azpiprozesu S/I errorea"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria askieza"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "huts %s azpiprozesuan idaztean"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "Huts %s azpiprozesua irakurtzerakoan"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "%s azpiprozuarekiko komunikazioak huts egin du"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
@@ -292,18 +292,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "ezin da tutua sortu"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle -ek huts egin du"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "ezin da \"%s\" irteera fitxategia sortu"
@@ -335,11 +335,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "`%s --help' erabili argibide gehiagorako.\n"
@@ -359,7 +359,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -374,21 +374,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  laguntza hau bisarazi eta irten\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  laguntza hau bisarazi eta irten\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
@@ -398,20 +398,20 @@ msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Programa erroreen berri emateko: <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -421,10 +421,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s-ek idatzia.\n"
@@ -455,37 +455,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "errorea \"%s\" irakurketarako irekitzerakoan"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "a formateatu - u in s t in"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "%u argumentuaren formatu espezifikazioa ez dago  '%s'-en"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -526,8 +526,7 @@ msgstr ""
 "du."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "'msgid' eta '%s' -ren formatu espezifikazio zenbakiak ez dira berdinak"
@@ -763,7 +762,7 @@ msgstr ""
 msgid ""
 "a format specification for arguments %u and %u doesn't exist in '%s', only "
 "one argument may be ignored"
-msgstr "a formateatu - u in s t in"
+msgstr "%u argumentuaren formatu espezifikazioa ez dago  '%s'-en"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
@@ -844,8 +843,8 @@ msgstr "formateatu in eta s"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formateatu in s a - in"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "a formateatu - s t in s"
@@ -862,59 +861,59 @@ msgstr "Handiagotu u tamaina da honekin k."
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "Handiagotu u k da Bielorrusiarra a."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "%u zenbakidun direktiban, '{' ez dago argumentu zenbaki batez jarraitua."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "Handiagotu u k da Bielorrusiarra a."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "%u zenbakidun direktiban, zehatapena ez da onartze '%c' ondoren"
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, fuzzy, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "Handiagotu u l da."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 #, fuzzy
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr "katea nori eta izengabe."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, fuzzy, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "katea nori s in."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "a formateatu - s in s t in"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -966,7 +965,7 @@ msgid ""
 msgstr "u da a eta."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1014,11 +1013,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ostalari izenaren helbidea\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informazio irteera:\n"
@@ -1090,12 +1089,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "behintzat sarrera fitxategi bat onartu da"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s eta %s ez dira bateragarriak"
@@ -1114,7 +1113,7 @@ msgstr ""
 "Itzulpen katalogko kateak beraien atributuen arabera iragazi,\n"
 "eta beren atributuak eraldatu.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1125,10 +1124,10 @@ msgstr ""
 "Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera "
 "laburrentzat ere.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Sarrera fitxategi kokapena:\n"
@@ -1138,10 +1137,10 @@ msgstr "Sarrera fitxategi kokapena:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  SARRERA_FITXATEGIA        sarrera PO fitxatergia\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1157,23 +1156,23 @@ msgstr ""
 "Sarrera fitxategirik ematen ez bada edo berau - bada, sarrera estandarra "
 "irakurriko da.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Irteera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FITX      idatzi irteera ezarritako fitxategian\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1185,7 +1184,7 @@ msgstr ""
 "bada\n"
 "edo berau - bada.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Mezu hautapena:\n"
@@ -1307,9 +1306,9 @@ msgstr ""
 "      --obsolete              --only-obsolete --clear-obsolete -ren "
 "sinonimo\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1334,17 +1333,17 @@ msgstr ""
 "      --stringtable-input     sarrera fitxategia NeXTstep/GNUstep .strings "
 "sintaxian dago\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Irteera xehetasunak:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1353,25 +1352,25 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             ez erabili C ihesak irteeran (lehenetsia)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1379,97 +1378,97 @@ msgstr ""
 "  -E, --escape                C ihesak erabili irteeran, ez hedatutako "
 "karaktereak\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              PO fitxategia idatzi nahiz hutsik egon\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                .po fitxategia koskadun estiloa erabiliaz "
 "idatzi\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ZENBAKIA        irteera orri zabalera ezarri\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ordenatutako irteera sortu\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          irteera fixattegi kokapenaz ordenatu\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ezinezko hatapen kriterio bat ezarri da (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [SARRERA_FITX]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1483,46 +1482,46 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               sarrera fitxategiak\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FITXATEGI       sarrera fitxategi zerrenda FITXATEGI-tik "
 "eskuratu\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Sarrera fitxategia - bada, sarrera estandarra irakurriko da.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1531,7 +1530,7 @@ msgstr ""
 "  -P, --properties-input      sarrera fixtategiak Java .properties sintasian "
 "daude\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1541,26 +1540,26 @@ msgstr ""
 "      --stringtable-input     sarrera fitxategiak NeXTstep/GNUstep .strings\n"
 "                              sintaxian daude\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=IZENA         irteeraren kodeketa\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1658,19 +1657,19 @@ msgstr "mezu hau erabilia dago baina ez dago %s-en ezarria"
 msgid "warning: this message is not used"
 msgstr "oharra: mezu hau ez da erabiltzen"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "errorea konponezin %d aurkitu da"
 msgstr[1] "%d errorea konponezin aurkitu dira"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "behintza bi fitxategi ezarri behar dira"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1683,14 +1682,14 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1739,7 +1738,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                Uniforum zehatz irteera estiloa\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "ez da sarrera fitxategirik eman"
@@ -1903,119 +1902,119 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "s hau duena a katea"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, fuzzy, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 "Sarrera fitxategirik ematen ez bada edo berau - bada, sarrera estandarra "
 "irakurriko da.\n"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s-ek \"-d directory\" ezarpen bat behar du"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, fuzzy, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, fuzzy, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s eta %s ez dira bateragarriak"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s bakarrik %s edo %s-rekin da erabilgarria"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s bakarrik %s, %s edo %s-rekin da erabilgarria"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "ezin da \"%s\" irteera fitxategia sortu"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "itzulitako kate %d"
 msgstr[1] "%d itzulitako kate"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", zalantzan kate %d"
 msgstr[1] ", %d kate zalantzan"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", itzuli gabeko kate %d"
 msgstr[1] ", %d itzuli gabeko kate"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Erabilera: %s [AUKERA] fitxategizena.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Testu itzulpen deskribapen batetik mezu katalogo bitar bat sortu.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fitxategizena.po ...             sarrera fitxategiak\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Funtzionamendu modua:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2024,7 +2023,7 @@ msgstr ""
 "  -j, --java                  Java modua: Java ResourceBundle klase bat "
 "sortu\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2033,20 +2032,20 @@ msgstr ""
 "      --java2                 --java bezala ,  bain Java2 erabiliaz (JDK 1.2 "
 "edo altuagoa)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                C# modua: .NET .dll fitxategi bat sortu\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2054,44 +2053,44 @@ msgstr ""
 "      --tcl                   Tcl modua: tcl/msgcat .msg fitxategi bat "
 "sortu\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt modua: Qt .qm fitxategi bat sortu\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, fuzzy, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --qt                    Qt modua: Qt .qm fitxategi bat sortu\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    Qt modua: Qt .qm fitxategi bat sortu\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                Uniforum zehatz modua gaitu\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Irteera fitxategia - bada, irteera irteera estandarrean idatziko da.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Irteera fitxategi kokapena java moduan:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2100,7 +2099,7 @@ msgstr ""
 "  -l, --locale=LAKALA         lokal izena, edo hizkunzta edo "
 "hizkutza_NAZIOA\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, fuzzy, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2109,7 +2108,7 @@ msgstr ""
 "      --tcl                   Tcl modeua: sarrera tcl/msgcat .msg fitxategi "
 "bat da\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2117,7 +2116,7 @@ msgstr ""
 "  -d DIRECTORY                klse direktorio ierarkiaren oinarri "
 "direktorioa\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2131,37 +2130,37 @@ msgstr ""
 "azpian\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Irteera fitxategi kokalekua C# moduan:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Irteera fitxategi kokapena Tcl moduan:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                msg mezu katalogoen oinarri direktorioa\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2171,30 +2170,30 @@ msgstr ""
 "direktorioan\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, fuzzy, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 "  -d DIRECTORY                msg mezu katalogoen oinarri direktorioa\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2202,27 +2201,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Sarrera fitxategi interpretazioa:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2230,33 +2229,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2264,18 +2263,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             zalantzazko kateak erabili irteeran\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2284,7 +2283,7 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2292,85 +2291,85 @@ msgstr ""
 "      --no-hash               fitxategi bitarrak ez du hash taula "
 "barneratuko\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            itzulpenaren estatistikak inprimatu\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               handitu argibide maila\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "oharra: PO fitxategi goiburua falta edo baliogabea da\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "oharra: karaktere joko bihurketak ez du funtzionatuko\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "oharra: PO fitxategi burua nahasirik\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "oharra: msgfmt-ren bertsio zaharragoek errorea emango dute honetan\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "\"%s\" domeinu izena ez da fixtategi izen bezala erabili"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "\"%s\" domeinu izena ez da fixtategi izen bezala erabili: aurrizki bat "
 "erabiliko da"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "`domain %s' direktiba alde batetara utziko da"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "hutsik dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "zalantzan dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: oharra: jatorri fitxategiak zalantzazko itzulpenak ditu"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
@@ -2577,12 +2576,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s paketearen Ingelesezko itzulpena"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "dagoen \"%s\" karaktere jokoa ez da kodeketa izen portable bat"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "bi karaktere joko ezberdin \"%s\" eta \"%s\" sarrera fitxategian"
@@ -2600,14 +2599,14 @@ msgid ""
 "charset specification"
 msgstr "s in s t a goiburua honekin a"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, fuzzy, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "s da a."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "oharra: "
@@ -2697,26 +2696,26 @@ msgstr ""
 "'%s'-ren irteera okerra izan daiteke.\n"
 "Aukera bat LC_ALL=C ezartzea da.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "espresio pluralek balio negatiboak sortu ditzakete"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu baina plural espresioek %lu baino balio handiagoak sortu "
 "ditzakete"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "espresio pluralek 0-z zatiketak srotu ditzakete"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "espresio pluralek zenbaki oso gainezkatze bat sortu dezakete"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2724,51 +2723,51 @@ msgstr ""
 "espresio pluralek salbuespen aritmetikoak sortu ditzakete, posibleki 0-z "
 "zatiketak"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Hurrengoa erabiliaz saiatu, %s-rentzat baliagarria:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "mezu katalogoak plural moduko itzulpenak ditu"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "baina goiburuak ez du \"plural=ESPRESIOA\" atributurik"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "baina goiburuak ez du \"nplurals=ZENBAKI_OSO\" atributurik"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "nplurals balio baliogabea"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "plural espresio baliogabea"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "baina zenbait mezuk bakarrik forma plural bat dute"
 msgstr[1] "baina zenbait mezuk bakarrik %lu forma plural dituzte"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "baina zenbait mezuk forma plural bat dute"
 msgstr[1] "baina zenbait mezuk %lu forma plural dituzte"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2776,93 +2775,98 @@ msgstr ""
 "mezu katalogoak plural moduko iztuilpenak ditu, baina ez du \"Plural-Forms: "
 "nplurals=INTEGER; plural=EXPRESSION;\" goiburuan"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' eta`msgid_plural' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' eta `msgstr' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' eta`msgid_plural' sarrerak ez dira biak honela amaitzen: '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' sarrerak ez dira biak honela amaitzen: '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' eta `msgstr' sarrerak ez dira biak honela amaitzen: '\\n''"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural kudeaketa GNU gettext hedapen bat da"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "`%s' goiburu eremua falta da goiburuan\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: sarrera ez da baliozkoa \"%s\" kodeketan"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: errorea \"%s\" kodeketatik \"%s\" kodeketara bihurketa egitean"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "sarrera fitxategiak ez du karaktere jokoa ezartzen duen goiburu sarrerarik"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2871,15 +2875,15 @@ msgstr ""
 "Ezinda \"%s\"-tik \"%s\"-ra bihurketa egin. %s iconv() funtzioan "
 "oinarriturik dago, eta iconv() -ek ez du bihurketa hau onartzen."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3274,7 +3278,7 @@ msgstr "lerro-amaiera katerik gabe"
 msgid "context separator <EOT> within string"
 msgstr "kontestu bereizlea <EOT> katerik gabe"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "fitxategi honek ez lituzke domeinu direktibak izan beharko"
@@ -3292,36 +3296,35 @@ msgid "unterminated group name"
 msgstr ""
 
 #: src/read-desktop.c:286
-#, fuzzy
 msgid "invalid non-blank character"
-msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
+msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "iragazki izena falta da"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "nplurals balio baliogabea"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" fixtategia hondaturik dago"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "s hau duena a katea"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" fitxategia ez da GNU .mo formatukoa"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "s hau duena a katea s"
@@ -3497,25 +3500,25 @@ msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
 msgid "compilation of C# class failed"
 msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "errorea \"%s\" idaztekatarako irekitzerakoan"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ez da baliozko java klase izena: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java klasearen konpilazioak huts egin du, saiatu --verbose erabiliz edo "
 "$JAVAC ezarriz"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3619,12 +3622,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "formateatu t n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "s l katea"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "s l"
@@ -3644,7 +3647,7 @@ msgstr "s l"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "s l katea"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr "ASCII katea s s Nork n"
@@ -3677,7 +3680,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l Osatugabea - Nork n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv hutsa"
@@ -3689,7 +3692,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr "s l Baliogabea Nork n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
@@ -3709,54 +3712,54 @@ msgstr "%s:%d: oharra: ')' aurkitu da '}' espero zen lekuan"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: oharra: '}' aurkitu da ')'espero zen lekuan"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "`%s' hizkuntza ezezaguna"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing ezin da erabili irteera irteera estandarrean idazten denean"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "oharra: `%s' fitxategi hedaopena `%s' ezezaguna da, C probatuko da"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Irauli kate itzulgarriak emandako sarrera fitxategietatik.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3765,12 +3768,12 @@ msgstr ""
 "  -d, --default-domain=IZENA   IZENA erabili irteerarako (messages.po "
 "ordez)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           idatzi irteera ezarritako fitxategian\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3778,12 +3781,12 @@ msgstr ""
 "  -p, --output-dir=DIR        irteera fitxategiak DIR direktorioan utziko "
 "dira\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Sarrera fitxategiaren hizkuntza hautapena:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3803,12 +3806,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++-ren laburopena\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3817,7 +3820,7 @@ msgstr ""
 "Lehenespen bezala hizkuntza sarrera fitxategiaren izen hedapenaz igarriko "
 "da.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3826,24 +3829,24 @@ msgstr ""
 "      --from-code=NAME        sarrera fixtategien kodeket\n"
 "                                (Python, Tcl, Glade-en ezezik)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Lehenespen modura sarrera fitxategiak ASCII direla suposatuko da.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FITXATEGIA.po  FITXATEGIA.po fitxategiko kateak ez dira "
 "irauliko\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3853,15 +3856,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3869,17 +3872,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Hizkuntzaren aukera bereziak:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           kate guztiak atera\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3894,7 +3897,7 @@ msgstr ""
 "                                Perl, PHP, GCC-source eta Glade hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3909,7 +3912,7 @@ msgstr ""
 "                                Perl, PHP, GCC-source eta Glade hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3917,7 +3920,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3932,38 +3935,50 @@ msgstr ""
 "                                Tcl, Perl, PHP, GCC-source hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ANSI C trigraphs-ak ulertu sarreran\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC hizkuntzetan bakarrik)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=FITXATEGI       sarrera fitxategi zerrenda FITXATEGI-tik "
+"eskuratu\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (C++ hizkuntz bakarrik)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ hizkuntz bakarrik)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost formatuko kateak antzeman\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3971,29 +3986,22 @@ msgstr ""
 "      --debug                 kate formatu atzemateari buruzko informazio "
 "hedatuagoa\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     idatzi Java .properties fitxategi bat\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=FITXATEGI       sarrera fitxategi zerrenda FITXATEGI-tik "
-"eskuratu\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --strict                idatzi uniforum zehatz estiloan\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4001,17 +4009,17 @@ msgstr ""
 "      --foreign-user          alde batera utzi FSF copyright-a kanpoko "
 "erabiltzaileen irteeran\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4019,7 +4027,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOSTA@HELBIDEA  msgid erroreentzat erreporte "
 "helbidea ezarri\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4029,7 +4037,7 @@ msgstr ""
 "  -M, --msgstr-prefix[=KATEA]  KATEA erabili edo \"\" aurrizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4039,7 +4047,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=KATEA]  KATEA erabili edo \"\" atzizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4047,45 +4055,45 @@ msgid ""
 msgstr ""
 "--flag argumentuak ez du <hitz-ako>:<argzenb>:[pasa-]<badera> sintasia: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "sarrera estandarra"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: oharra: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4094,7 +4102,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4104,28 +4112,28 @@ msgstr ""
 "gettext(\"\")-ek meta informazioa duen goiburua\n"
 "itzultzen du, ez date hutsa.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "oharra: argumentu ezarpen zalanatzagarria '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "oharra: kontestua falta da '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "oharra: kontestua falta da '%.*s' hitz-gakoaren plural arumentuarentzat"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontestu parekatze okerra formatu singular eta pluralaren artean"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4138,7 +4146,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS aldagaia hor; bestela mesedez ezarri\n"
 "--msgid-bugs-address aukera komando lerroan.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "`%s' hizkuntza ezezaguna"
@@ -4239,14 +4247,14 @@ msgstr "%s:%d: interpolazio baliogabea (\"\\L\") 8bit-eko karakterean\"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\U\") 8bit-eko karakterean\"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "ASCII katea s s Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4254,7 +4262,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4262,7 +4270,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l osatu gabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4270,7 +4278,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Osatugabea - Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4278,7 +4286,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Osatugabea - Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4286,22 +4294,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodeketa ezezaguna. ASCII erabiliaz aurrera egingo da."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: kate definizio baliogabea"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: zenbaki bat faltda da # ondoren"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: kate espresio baliogabea"
@@ -4448,16 +4456,6 @@ msgstr ""
 msgid "document ended unexpectedly: %s"
 msgstr ""
 
-#~ msgid "%s:%lu:%lu: %s"
-#~ msgstr "%s:%lu:%lu: %s"
-
-#~ msgid ""
-#~ "Language \"glade\" is not supported. %s relies on expat.\n"
-#~ "This version was built without expat.\n"
-#~ msgstr ""
-#~ "\"glade\" hizkuntza ez da onartzen. %s expat-en oinarritua.\n"
-#~ "Bertsio hau expta gabe eraiki da.\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: legezkanpoko aukera -- %c\n"
 
@@ -4503,3 +4501,13 @@ msgstr ""
 #~ msgstr ""
 #~ "mezu katalogoak testuinguruarekiko dependentzia duten itzulpenak ditu\n"
 #~ "baina Java ResourceBundle formatuak ez du testuingururik onartzen\n"
+
+#~ msgid "%s:%lu:%lu: %s"
+#~ msgstr "%s:%lu:%lu: %s"
+
+#~ msgid ""
+#~ "Language \"glade\" is not supported. %s relies on expat.\n"
+#~ "This version was built without expat.\n"
+#~ msgstr ""
+#~ "\"glade\" hizkuntza ez da onartzen. %s expat-en oinarritua.\n"
+#~ "Bertsio hau expta gabe eraiki da.\n"
diff --git a/gettext-tools/po/fi.gmo b/gettext-tools/po/fi.gmo
index 724cbcf..f7e6c21 100644
--- a/gettext-tools/po/fi.gmo
+++ b/gettext-tools/po/fi.gmo
diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index c74207d..d5cde05 100644
--- a/gettext-tools/po/fi.po
+++ b/gettext-tools/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-09-01 19:17+0300\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -112,7 +112,7 @@ msgid "Unknown system error"
 msgstr "Tuntematon järjestelmän virhe"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -190,15 +190,15 @@ msgstr "virheellinen source_version-argumentti kohteelle compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "virheellinen target_version-argumentti kohteelle compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "tiedoston �%s� luominen epäonnistui"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -223,40 +223,40 @@ msgid "%s subprocess I/O error"
 msgstr "%s aliprosessisiirräntävirhe"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "muisti loppui"
 
 #  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "säikeiden luominen epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "kirjoittaminen aliprosessiin %s epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "lukeminen aliprosessista %s epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "ei-lukitsevan siirron asettaminen aliprosessiin %s epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "viestintä aliprosessin %s kanssa epäonnistui"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s aliprosessi päättyi poistumiskoodilla %d"
@@ -295,18 +295,18 @@ msgstr "�"
 msgid "setting permissions for %s"
 msgstr "asetetaan käyttöoikeuksia kohteelle %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "putken luominen epäonnistui"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle epäonnistui"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "epäonnistunut tiedostotunnisteen %d palautus: dup2 epäonnistui"
@@ -338,11 +338,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Komento ’%s --help’ antaa lisää tietoja.\n"
@@ -362,7 +362,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -377,21 +377,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -V, --version                Näytä versiotiedot\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  näytä tämä ohje ja poistu\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               tulosta ohjelman versiotiedot ja poistu\n"
@@ -401,11 +401,11 @@ msgstr "  -V, --version               tulosta ohjelman versiotiedot ja poistu\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu."
@@ -415,11 +415,11 @@ msgstr ""
 
 # Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -433,10 +433,10 @@ msgstr ""
 "Ohjelmalle EI ANNETA TAKUUTA lain sallimissa rajoissa.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Kirjoittanut %s.\n"
@@ -467,18 +467,18 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "virhe avattaessa tiedostoa �%s� lukemista varten"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -487,19 +487,19 @@ msgstr ""
 "olemassa merkkijonossa ’%s’"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "muotomäärittelyä argumentille %u ei ole merkkijonossa ’%s’"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -543,8 +543,7 @@ msgstr ""
 "%u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -881,8 +880,8 @@ msgstr ""
 "muotomäärittelyt merkkijonossa ’%s’ eivät ole merkkijonon ’%s’ "
 "muotomäärittelyiden osajoukko"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "muotomäärittelyä argumentille ’%s’ ei löydy merkkijonosta ’%s’"
@@ -901,31 +900,31 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa kenttänimeä."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getattr-argumenttia."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getitem-argumenttia."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 "Direktiivissä numero %u ei sallita enempää sisäkkäisyyttä muotomääritteessä."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "Direktiivissä numero %u on päättämätön muotodirektiivi."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -933,13 +932,13 @@ msgstr ""
 "Merkkijono viittaa argumentteihin sekä argumenttinimien että nimettömien "
 "argumenttimäärittelyjen avulla."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "Merkkijono viittaa argumenttiin nimeltään ’%s’ yhteensopimattomilla tavoilla."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -947,7 +946,7 @@ msgstr ""
 "muotomäärittelyt merkkijonossa ’%s’ edellyttävät kartoitusta, "
 "muotomäärittelyt merkkijonossa ’%s’ edellyttävät järjestettyä joukkoa"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -955,7 +954,7 @@ msgstr ""
 "muotomäärittelyt merkkijonossa ’%s’ edellyttävät järjestettyä joukkoa, "
 "muotomäärittelyt merkkijonossa ’%s’ edellyttävät kartoitusta"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -963,7 +962,7 @@ msgstr ""
 "muotomäärittelyä argumentille ’%s’, kuten merkkijonossa ’%s’:ssä, ei löydy "
 "merkkijonosta ’%s’"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1019,7 +1018,7 @@ msgid ""
 msgstr "Merkki, joka päättää direktivin numero %u ei ole luku välillä 1...9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1067,11 +1066,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            osoitteet tietokoneelle\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Selittävä tuloste:\n"
@@ -1143,12 +1142,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "enintään yksi syötetiedosto on sallittu"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "valitsimet %s ja %s ovat toisensa poissulkevia"
@@ -1167,7 +1166,7 @@ msgstr ""
 "Suodattaa käännösluettelon viestit niiden attribuuttien mukaan,\n"
 "ja manipuloi attribuutteja.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1177,10 +1176,10 @@ msgid ""
 msgstr ""
 "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Syötetiedostosijainti:\n"
@@ -1190,10 +1189,10 @@ msgstr "Syötetiedostosijainti:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  SYÖTETIEDOSTO               syötteen PO-tiedosto\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1207,24 +1206,24 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "Jos syötetiedostoa ei ole annettu tai se on -, luetaan vakiosyöte.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Tulostetiedostosijainti:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=TIEDOSTO  kirjoita tuloste määriteltyyn tiedostoon\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1236,7 +1235,7 @@ msgstr ""
 "määritelty\n"
 "tai jos se on -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Viestivalinta:\n"
@@ -1356,9 +1355,9 @@ msgstr ""
 "      --obsolete              synonyymi valitsimelle --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1383,17 +1382,17 @@ msgstr ""
 "      --stringtable-input     syötetiedosto on NeXTstep/GNUstep .strings -"
 "syntaksissa\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Tulosteen yksityiskohdat:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1408,18 +1407,18 @@ msgstr ""
 "                              MILLOIN saattaa olla ’always’, ’never’, "
 "’auto’, tai ’html’.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=TYYLITIEDOSTO   määritä CSS-tyylisääntötiedosto valitsimelle --"
 "color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1427,9 +1426,9 @@ msgstr ""
 "  -e, --no-escape             älä käytä C-koodinvaihtomerkkejä tulosteessa "
 "(oletus)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1437,39 +1436,39 @@ msgstr ""
 "  -E, --escape                käytä C-koodinvaihtomerkkejä tulosteessa, ei "
 "laajennettuja merkkejä\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              kirjoita PO-tiedosto vaikka se on tyhjä\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                kirjoita .po -tiedosto käyttäen sisennettyä "
 "tyyliä\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           älä kirjoita ’#: filename:line’ -rivejä\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          tuota ’#: filename:line’ -rivit (oletus)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1477,32 +1476,32 @@ msgstr ""
 "      --strict                luo tiukasti Uniforum-yhteensopiva .po-"
 "tiedosto\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     luo Java .properties -tiedosto\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    luo NeXTstep/GNUstep .strings -tiedosto\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMERO          aseta tulostesivun leveys\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1512,33 +1511,33 @@ msgstr ""
 "kuin\n"
 "                              tulostesivun leveys, useammalle riville\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           tuota lajiteltu tuloste\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          lajittele tuloste tiedostosijainnin mukaan\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "määritelty mahdoton valintakriteeri (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]...\n"
 
 #  Pistekommentilla tarkoitan kehittäjän kääntäjää varten lisäämiä kommentteja, jotka alkavat risuaitamerkillä ja sen jälkeisellä pisteellä.
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1561,25 +1560,25 @@ msgstr ""
 "--use-first on määritelty. Silloin ne otetaan ensimmäisestä PO-tiedostosta,\n"
 "joka on määritellyt ne.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  SYÖTETIEDOSTO ...           syötetiedostot\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=TIEDOSTO   hae syötetiedostojen luettelo TIEDOSTOsta\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jos syötetiedosto on -, luetaan vakiosyötettä.\n"
 
 #  Tässä defaults taitaa olla verbi yksikön kolmannessa persoonassa.
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1590,7 +1589,7 @@ msgstr ""
 "                              määrittelyä. Oletus ääretön, jos ei ole "
 "asetettu\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1600,7 +1599,7 @@ msgstr ""
 "monta\n"
 "                              määrittelyä. Oletus 0, jos ei ole asetettu\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1610,7 +1609,7 @@ msgstr ""
 "pyynnöille\n"
 "                              että vain uniikkeja viestejä tulostetaan\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1619,7 +1618,7 @@ msgstr ""
 "  -P, --properties-input      syötetiedostot ovat Java .properties -"
 "syntaksissa\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1629,12 +1628,12 @@ msgstr ""
 "      --stringtable-input     syötetiedostot ovat NeXTstep/GNUstep .strings\n"
 "                              -syntaksissa\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NIMI          koodaus tulosteelle\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1645,14 +1644,14 @@ msgstr ""
 "                              jokaiselle viestille, älä yhdistä useita "
 "käännöksiä\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=LUETTELONIMI     aseta ’Language’-kenttä otsakkeessa\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1760,19 +1759,19 @@ msgstr ""
 msgid "warning: this message is not used"
 msgstr "varoitus: tätä viestiä ei käytetä"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d vakava virhe"
 msgstr[1] "%d vakavaa virhettä"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "on annettava vähintään kaksi tiedostoa"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1793,7 +1792,7 @@ msgstr ""
 "--use-first on määritelty. Silloin ne otetaan ensimmäisestä PO-tiedostosta,\n"
 "joka on määritellyt ne. Tiedostosijainnit kaikista PO-tiedostoista kumuloituvat.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1804,7 +1803,7 @@ msgstr ""
 "                              monta määrittelyä. Oletus 1, jos ei ole "
 "asetettu\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1852,7 +1851,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                tiukka Uniforum-tulostetyyli\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "syötetiedostoa ei annettu"
@@ -2038,119 +2037,119 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "syötetuloste ei pääty rivinvaihtoon"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentti valitsimeen %s pitäisi olla yksittäinen välimerkki"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "virheellinen endian-tyyppi: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "syötetiedostoa ei pitäisi antaa, jos %s ja %s on määritelty"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "valitsin %s vaatii �-d directory�-määrittelyn"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "valitsin %s vaatii �-l locale�-määrittelyn"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "valitsin %s vaatii �--template template�-määrittelyn"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "valitsin %s vaatii �-o file�-määrittelyn"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "valitsimet %s ja %s ovat toisensa poissulkevia kohteessa %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "valitsin %s on kelvollinen vain valitsimen %s tai %s kanssa"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "valitsin %s on kelvollinen vain valitsimen %s, %s tai %s kanssa"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "tulostetiedoston �%s� luominen epäonnistui"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d käännetty viesti"
 msgstr[1] "%d käännettyä viestiä"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d vajaa käännös"
 msgstr[1] ", %d vajaata käännöstä"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d kääntämätön viesti"
 msgstr[1] ", %d kääntämätöntä viestiä"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Käyttö: %s [VALITSIN] tiedosto.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Tuota binäärimuotoisia viestiluetteloita tekstimuotoisesta "
 "käännöskuvauksesta.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  tiedosto.po ...             syötetiedostot\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Toimintatila:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2158,7 +2157,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java-tila: tuota Java ResourceBundle -luokka\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2167,12 +2166,12 @@ msgstr ""
 "      --java2                 kuten --java, ja otaksu Java2 (JDK 1.2 tai "
 "uudempi)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C#-tila: tuota .NET .dll -tiedosto\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2181,52 +2180,52 @@ msgstr ""
 "      --csharp-resources      C#-resurssitila: tuota .NET .resources -"
 "tiedosto\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl-tila: tuotaa tcl/msgcat .msg -tiedosto\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt-tila: tuota Qt .qm -tiedosto\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 "      --desktop               Työpöytä-syöttötila: tuota .desktop -tiedosto\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    Qt-tila: tuota Qt .qm -tiedosto\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ota käyttöön tiukka Uniforum-tila\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Jos tulostiedosto on -, tuloste kirjoitetaan vakiotulosteeseen.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Tulostetiedostosijainti Java-tilassa:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURSSI     resurssinimi\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2234,7 +2233,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=MAA-ASETUSTO   maa-asetuston nimi, joko kieli tai kieli_MAA\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2242,14 +2241,14 @@ msgid ""
 msgstr ""
 "      --source                tuota .java-tiedosto, eikä .class -tiedostoa\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d HAKEMISTO                luokkien hakemistohierarkian perushakemisto\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2261,12 +2260,12 @@ msgstr ""
 "erottamalla ne alaviivalla.  Valitsin -d on pakollinen.  Luokka on\n"
 "kirjoitettu määriteltyyn hakemistoon.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Tulostetiedostosijainti C#-tilassa:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2275,7 +2274,7 @@ msgstr ""
 "  -d HAKEMISTO                perushakemisto paikallisasetuksista "
 "riippuville .dll-tiedostoille\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2285,17 +2284,17 @@ msgstr ""
 "määriteltyyn\n"
 "alihakemistoon, jonka nimi riippuu paikallisasetuksesta.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tulostetiedostosijainti Tcl-tilassa:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d HAKEMISTO                perushakemisto .msg-viestiluetteloille\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2304,23 +2303,23 @@ msgstr ""
 "Valitsimet -l ja -d ovat pakollisia.  Tiedosto .msg kirjoitetaan\n"
 "määriteltyyn hakemistoon.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Työpyötäsyöttötilan valitsimet:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "  --template=MALLINNE         tiedostoa .desktop käytetään mallinteena\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d HAKEMISTO                .po-tiedostojen perushakemisto\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2329,7 +2328,7 @@ msgstr ""
 "  -kWORD, --keyword=WORD      etsi WORD-argumentti lisäavainsanana\n"
 "  -k, --keyword               älä käytä oletusavainsanoja\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2340,28 +2339,28 @@ msgstr ""
 "määritellään,\n"
 "syötetiedostot luetaan hakemistosta eikä komentoriviargumentteina.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, fuzzy, c-format
 msgid "XML mode options:\n"
 msgstr "Työpyötäsyöttötilan valitsimet:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, fuzzy, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 "  --template=MALLINNE         tiedostoa .desktop käytetään mallinteena\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Syötetiedoston tulkinta:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2373,13 +2372,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          tarkista kieliriippuvaiset muotomerkkijonot\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2387,7 +2386,7 @@ msgid ""
 msgstr ""
 "      --check-header          tarkista otsakkeen olemassaolo ja sisältö\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2397,7 +2396,7 @@ msgstr ""
 "valitsimen\n"
 "                                --output-file väliset ristiriidat\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2406,7 +2405,7 @@ msgstr ""
 "  -C, --check-compatibility   tarkista, että GNU msgfmt käyttäytyy kuin X/"
 "Open msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2417,12 +2416,12 @@ msgstr ""
 "olemassaolo\n"
 "                                valikkoriveillä\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             käytä vajausmerkintöjä tulosteessa\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2430,7 +2429,7 @@ msgstr ""
 "  -a, --alignment=NUMERO      tasaa merkkijonot NUMEROon tavuun (oletus: "
 "%d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2444,89 +2443,89 @@ msgstr ""
 "riippuu\n"
 "                                alustasta)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               binaaritiedosto ei sisällä hash-taulua\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            tulosta tilastot käännöksistä\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               kasvata laveustasoa\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "varoitus: PO-tiedoston otsake puuttuu tai on virheellinen\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "varoitus: merkistömuunnos ei tule toimimaan\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "varoitus: PO-tiedoston otsake on merkitty vajaaksi\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "varoitus: msgfmt:n vanhat versiot antavat tästä virheen\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nimiavaruusnimi �%s� ei ole sopiva tiedostonimenä"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "nimiavaruusnimi �%s� ei ole sopiva tiedostonimenä: käyttää etuliitettä"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "’nimiavaruus %s’-direktiivi ohitetaan"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "tyhjä ’msgstr’-merkkijono jätetty huomioimatta"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "vajaa ’msgstr’-merkkijono jätetty huomioimatta"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s ei ole olemassa"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s on olemassa, mutta sen lukeminen epäonnistui"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "virhe luettaessa tiedostoa �%s�"
@@ -2774,12 +2773,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Suomenkielinen käännös %s-paketille"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "nykyinen merkistö �%s� ei ole siirrettävä koodausnimi"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "kaksi erilaista merkistöä �%s� ja �%s� syötetiedostossa"
@@ -2799,14 +2798,14 @@ msgstr ""
 "nimiavaruus �%s� syötetiedostossa ’%s’ ei sisällä otsaketta, jossa on "
 "merkistömäärittely"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "kohdemerkistö %s� ei ole siirrettävä koodausnimi."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "varoitus: "
@@ -2903,24 +2902,24 @@ msgstr ""
 "’%s’-tuloste saattaa olla virheellinen.\n"
 "Mahdollinen kiertokeino on asettaa muuttujaan LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "monikkolauseke voi palauttaa negatiivisia arvoja"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu, mutta monikkolauseke voi palauttaa jopa arvon %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "monikkolauseke voi aiheuttaa jaon nollalla"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "monikkolauseke voi aiheuttaa kokonaisluvun ylivuodon"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2928,51 +2927,51 @@ msgstr ""
 "monikkolauseke voi aiheuttaa aritmeettisia poikkeuksia, mahdollisesti jaon "
 "nollalla"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Yritä käyttää seuraavaa, kelvollinen kohteelle %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "viestiluettelossa on monikkomuotoisia käännöksiä"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "mutta otsakkeesta puuttuu attribuutti \"plural=LAUSEKE\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "mutta otsakkeesta puuttuu \"nplurals=KOKONAISLUKU\"-attribuutti"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "virheellinen nplurals-arvo"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "virheellinen monikkolauseke"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "mutta joillakin viesteillä on vain yksi monikkomuoto"
 msgstr[1] "mutta joillakin viesteillä on vain %lu monikkomuotoa"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "mutta joillakin viesteillä on yksi monikkomuoto"
 msgstr[1] "mutta joillakin viesteillä on %lu monikkomuotoa"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2980,89 +2979,94 @@ msgstr ""
 "viestiluettelossa on monikkomuotoisia käännöksiä, mutta siitä puuttuu "
 "otsakerivi \"Plural-Forms: nplurals=KOKONAISLUKU; plural=LAUSEKE;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "’msgid’ ja ’msgid_plural’ -rivit eivät molemmat ala merkillä ’\\n’"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "’msgid’ ja ’msgstr[%u]’ -rivit eivät molemmat ala merkillä ’\\n’"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "’msgid’ ja ’msgstr’ -rivit eivät molemmat ala merkillä ’\\n’"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "’msgid’ ja ’msgid_plural’ -rivit eivät molemmat lopu merkillä ’\\n’"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "’msgid’ ja ’msgstr[%u]’ -rivit eivät molemmat lopu merkillä ’\\n’"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "’msgid’ ja ’msgstr’ -rivit eivät molemmat lopu merkillä ’\\n’"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "monikkomuotojen käsittely on GNU gettext -laajennos"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr-merkkijonosta puuttuu pikanäppäinmerkki ’%c’"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr-merkkijonossa on liian monta pikanäppäinmerkkiä ’%c’"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "otsakekenttä ’%s’ on edelleen oletusarvossaan\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "otsakekenttä ’%s’ puuttuu otsakkeessa\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "ASCII-ellipsi (’...’) eikä Unicode-ellipsi"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "välilyönti ennen ellipsiä löytyi käyttäjälle näkyvässä merkkijonossa"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "ASCII-kaksoislainausmerkki käytetty eikä Unicode-lainausmerkki"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 "ASCII-yksittäismerkkinen lainausmerkki käytetty eikä Unicode-lainausmerkki"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, fuzzy, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII-ellipsi (’...’) eikä Unicode-ellipsi"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: syöte ei ole kelvollinen �%s�-koodauksessa"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: virhe muunnettaessa �%s�-koodauksesta �%s�-koodaukseen"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "syötetiedosto ei sisällä otsaketta, jossa on merkistömäärittely"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3071,7 +3075,7 @@ msgstr ""
 "Muuntaminen koodauksesta �%s� koodaukseen �%s� epäonnistui. %s käyttää "
 "funktiota iconv(), ja iconv() ei tue tätä muunnosta."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3080,8 +3084,8 @@ msgstr ""
 "Muunnos koodauksesta �%s� koodaukseen �%s� esitteli kaksoiskappaleita: "
 "jotkut eri msgid-merkkijonot ovat samoja."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3520,7 +3524,7 @@ msgstr "rivinvaihto merkkijonon sisällä"
 msgid "context separator <EOT> within string"
 msgstr "kontekstierotin <EOT> merkkijonon sisällä"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tämä tiedosto ei ehkä sisällä nimiavaruusdirektiivejä"
@@ -3542,32 +3546,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr "varoitus: virheellinen Unicode-merkki"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "puuttuva suodatinnimi"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "virheellinen nplurals-arvo"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "tiedosto �%s� typistetään"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "tiedosto �%s� sisältää merkkijonon, jota ei ole päätetty NUL-merkillä"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "tiedosto �%s� ei ole GNU:n .mo-muodossa"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
@@ -3753,19 +3757,19 @@ msgstr "epäonnistunut C#-luokan kääntäminen, yritä valitsinta --verbose"
 msgid "compilation of C# class failed"
 msgstr "epäonnistunut C#-luokan kääntäminen"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "virhe avattaessa tiedostoa �%s� kirjoittamista varten"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "kelvoton Java-luokkanimi: %s"
 
 #  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
@@ -3773,7 +3777,7 @@ msgstr ""
 "muuttuja $JAVAC"
 
 #  käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "epäonnistunut Java-luokan kääntäminen, yritä asettaa muuttuja $JAVAC"
@@ -3887,12 +3891,12 @@ msgstr ""
 "viestiluettelossa on monikkomuotoisia käännöksiä\n"
 "mutta Tcl-viestiluettelomuoto ei tule monikkokäsittelyä\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: varoitus: päättämätön merkkijono"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: varoitus: päättämätön säännöllinen lauseke"
@@ -3912,7 +3916,7 @@ msgstr "%s:%d: varoitus: päättämätön merkkivakio"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Määritä lähdekoodaus valitsimen --from-code avulla."
 
@@ -3952,7 +3956,7 @@ msgstr ""
 "%s:%d: Vaillinainen monitavusekvenssi rivin lopussa.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv-häiriö"
@@ -3966,7 +3970,7 @@ msgstr ""
 "%s:%d: Virheellinen monitavusekvenssi.\n"
 "Määritä lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
@@ -3986,58 +3990,58 @@ msgstr "%s:%d: varoitus: ’)’ löytyi kun ’}’ odotettiin"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: varoitus: ’}’ löytyi kun ’)’ odotettiin"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 "’%s’ ei ole kelvollinen koodausnimi. Käytetään ASCII-koodia varmistuksena.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "syntaksitarkistus ’%s’ on tuntematon"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "lauselopputyyppi ’%s’ on tuntematon"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "valitsimen --join-existing käyttäminen epäonnistui kun tuloste kirjoitetaan "
 "vakiotulosteeseen"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ei voi työskennellä ilman etsittäviä avainsanoja"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "varoitus: tiedoston ’%s’ tarkennin ’%s’ on tuntematon; yritetään tarkenninta "
 "C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Poimi käännettävät merkkijonot annetuista syötetiedostoista.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4046,25 +4050,25 @@ msgstr ""
 "  -d, --default-domain=NIMI   käytä tiedostoa NIMI.po tulostukseen (eikä "
 "tiedostoa messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=TIEDOSTO       kirjoita tuloste määriteltyyn tiedostoon\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=HAKEMISTO  tulostetiedostot sijoitetaan HAKEMISTOon\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Syötetiedoston kielen valinta:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4085,13 +4089,13 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 "  -C, --c++                   pikavalitsin valitsimelle --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4099,7 +4103,7 @@ msgid ""
 msgstr ""
 "Oletuksena kieli on arvattu riippuen syötetiedostonimen tarkentimesta.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4108,24 +4112,24 @@ msgstr ""
 "      --from-code=NIMI        syötetiedostojen koodaus\n"
 "                                (paitsi kielille Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Oletuksen syötetiedostojen otaksutaan olevan ASCII-tekstiä.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         liitä viesti oleamssaolevaan tiedostoon\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FILE.po  rivejä tiedostossa FILE.po ei ole poimittu\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4140,18 +4144,18 @@ msgstr ""
 "avainsana-\n"
 "                                rivit tulostetiedostoon\n"
 
-#: src/xgettext.c:1117
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NIMI            suorita syntaksitarkistus viesteille\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
 "                                 quote-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4162,17 +4166,17 @@ msgstr ""
 "                                (single-space, joka on oletus, \n"
 "                                 tai double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Kielikohtaiset valitsimet:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           pura kaikki merkkijonot\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4187,7 +4191,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4202,7 +4206,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4213,7 +4217,7 @@ msgstr ""
 "argumentti-\n"
 "                              numeron ARG sisällä\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4228,38 +4232,49 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             ymmärrä ANSI C kolmimerkkejä syötettä varten\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (vain kielet C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=TIEDOSTO   hae syötetiedostojen luettelo TIEDOSTOsta\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (vain C++-kieli)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    tunnista Qt-muotoiset merkkijonot\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (vain C++-kieli)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   tunnista KDE 4 -muotoiset merkkijonot\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 tunnista Boost-muotoiset merkkijonot\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4267,29 +4282,23 @@ msgstr ""
 "      --debug                 yksityiskohtaisempi "
 "muotomerkkijonotunnistustulos\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     luo Java .properties -tiedoston\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=TIEDOSTO   hae syötetiedostojen luettelo TIEDOSTOsta\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --indent                sisennetty tulostetyyli\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=STRING  aseta copyright-omistajan tulosteessa\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4297,17 +4306,17 @@ msgstr ""
 "      --foreign-user          ohita FSF copyright-tulosteessa "
 "vieraskieliselle käyttäjälle\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  aseta pakkausnimi tulosteessa\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  aseta pakkausversio tulosteessa\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4315,7 +4324,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  aseta ilmoitusosoite msgid-"
 "vikailmoituksia varten\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4326,7 +4335,7 @@ msgstr ""
 "etuliitteenä msgstr-\n"
 "                                merkkijonon arvoille\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4337,7 +4346,7 @@ msgstr ""
 "loppuliitteenä msgstr-\n"
 "                                merkkijonon arvoille\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4346,31 +4355,31 @@ msgstr ""
 "Argumentilla --flag ei ole <avainsana>:<argumenttinumero>:[pass-]<lippu> -"
 "syntaksia: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "vakiosyöte"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Ei-ASCII-merkki osoitteessa %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Ei-ASCII-kommentti osoitteessa tai ennen osoitetta %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Ei-ASCII-merkkijono osoitteessa %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: varoitus: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4379,7 +4388,7 @@ msgstr ""
 "Vaikka käytetty muotomerkkijonopaikassa, merkkijono %s ei ole kelvollinen %s-"
 "muotomerkkijono. Syy: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4388,7 +4397,7 @@ msgstr ""
 "Vaikka esitelty sellaisena, merkkijono %s ei ole kelvollinen %s-"
 "muotomerkkijono. Syy: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4402,7 +4411,7 @@ msgstr ""
 "Harkitse muotomerkkijonon käyttämistä nimetyillä argumenteilla,\n"
 "ja kartoittamalla eikä argumenttien monilla.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4412,27 +4421,27 @@ msgstr ""
 "gettext(\"\") palauttaa otsakkeen metatiedolla,\n"
 "ei tyhjää merkkijonoa.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "argumenttimäärittely avainsanalle ’%.*s’ ei ole yksiselitteinen"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "varoitus: puuttuva konteksti avainsanalle ’%.*s’"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "varoitus: puuttuva konteksti avainsanan ’%.*s’ monikkoargumentille"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontekstitäsmäämättömyys yksikkö- ja monikkomuotojen välillä"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4444,7 +4453,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS-muuttuja; muussa tapauksessa\n"
 "määritä komentorivivalitsin --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "kieli ’%s’ on tuntematon"
@@ -4555,7 +4564,7 @@ msgstr "%s:%d: virheellinen 8-bitisen merkin �%c� interpolaatio (�\\L�)"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: virheellinen 8-bittisen merkin �%c� interpolaatio (�\\U�)"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4563,7 +4572,7 @@ msgstr ""
 "Määritä lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4574,7 +4583,7 @@ msgstr ""
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4585,7 +4594,7 @@ msgstr ""
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4596,7 +4605,7 @@ msgstr ""
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4607,7 +4616,7 @@ msgstr ""
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4618,22 +4627,22 @@ msgstr ""
 "Määritä lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Tuntematon koodaus �%s�. Jatketaan sen sijaan ASCII-koodauksella."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: virheellinen merkkijonomäärittely"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: numero puuttuu merkin # jäljestä"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: virheellinen merkkijonolauseke"
diff --git a/gettext-tools/po/fr.gmo b/gettext-tools/po/fr.gmo
index 1f91b31..6b999e8 100644
--- a/gettext-tools/po/fr.gmo
+++ b/gettext-tools/po/fr.gmo
diff --git a/gettext-tools/po/fr.po b/gettext-tools/po/fr.po
index e725ecd..9256f94 100644
--- a/gettext-tools/po/fr.po
+++ b/gettext-tools/po/fr.po
@@ -9,10 +9,10 @@
 # Stéphane Aulery <lkppo@free.fr>, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.7-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-23 12:40+0100\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-01 23:51+0200\n"
 "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -115,7 +115,7 @@ msgid "Unknown system error"
 msgstr "Erreur système non identifiée"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -193,15 +193,15 @@ msgstr "argument source_version invalide pour compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argument target_version invalide pour compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Échec lors de la création de « %s »"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -228,41 +228,41 @@ msgid "%s subprocess I/O error"
 msgstr "Erreur d'E/S du sous-processus %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "création des threads échouée"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "Échec d'écriture sur le sous-processus %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "Échec de lecture depuis le sous-processus %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 "Impossible d'établir des entrées/sorties non bloquantes pour le sous-"
 "processus %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "Échec de communication avec le sous-processus %s"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "Sous-processus %s terminé avec le code de sortie %d"
@@ -301,18 +301,18 @@ msgstr " »"
 msgid "setting permissions for %s"
 msgstr "configuration des permissions pour %s "
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "Création du tube impossible"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "Échec de la fonction « _open_osfhandle »"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "Impossible de restorer le descripteur de fichier %d : dup2 a échoué"
@@ -344,11 +344,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "L’élément <%s> n’a pas d’attribut <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayez « %s --help ».\n"
@@ -373,7 +373,7 @@ msgstr ""
 "de LOCALE depuis RÉGLES et les affiche sous au format de gettext.\n"
 "Si aucun argument n’est passé, il lit les règles de pluriel CLDR depuis l’entrée standard.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -389,21 +389,21 @@ msgstr ""
 "  -c, --cldr                  afficher les règles de pluriel au format CLDR\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  afficher ce message d'aide, puis terminer\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               afficher le numéro de version de ce programme, puis terminer\n"
@@ -413,20 +413,20 @@ msgstr "  -V, --version               afficher le numéro de version de ce progr
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Signalez tout bogue à <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -440,10 +440,10 @@ msgstr ""
 "Il n'y a PAS DE GARANTIE, dans la mesure de ce que permet la loi.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
@@ -474,18 +474,18 @@ msgid "extra operand %s"
 msgstr "opèrande supplémentaire %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Erreur lors de l'ouverture de « %s » en lecture "
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -494,19 +494,19 @@ msgstr ""
 "n'existe pas dans « %s »"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "Le format de l'argument « %u » n'a pas été spécifié dans « %s »"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -551,8 +551,7 @@ msgstr ""
 "La chaîne fait appel à l'argument numéro %u mais ignore l'argument numéro %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -904,8 +903,8 @@ msgstr ""
 "Les spécifications de format dans « %s » ne sont pas un sous-ensemble de "
 "celles de « %s »."
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "Le format de l'argument « %s » dans « %s » n'est pas spécifié."
@@ -925,19 +924,19 @@ msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 "Dans la directive numéro %u, « %c » ne peut pas débuter un nom de champ."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "Dans la directive numéro %u, « %c » ne peut pas débuter un argument getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 "Dans la directive numéro %u, « %c » ne peut pas débuter un argument getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -945,13 +944,13 @@ msgstr ""
 "Dans la directive numéro %u, aucune imbrication supplémentaire n'est permise "
 "dans le spécificateur de format."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 "Dans la directive numéro %u, il y a une directive de format indéterminée."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -959,12 +958,12 @@ msgstr ""
 "La chaîne fait référence à des arguments de deux façons différentes : avec "
 "des noms d'arguments et avec des spécifications d'arguments sans nom."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "La chaîne fait référence à l'argument « %s » de manière incompatible."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -972,7 +971,7 @@ msgstr ""
 "Les spécifications de format dans « %s » requièrent une carte de "
 "correspondance, celles de « %s » requièrent un n-uplet."
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -980,7 +979,7 @@ msgstr ""
 "Les spécifications de format dans « %s » requièrent un n-uplet (tuple), "
 "celles de « %s » requièrent une carte de correspondance (mapping)."
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -988,7 +987,7 @@ msgstr ""
 "Une spécification de format pour l'argument « %s », comme dans « %s », "
 "n'existe pas dans « %s »"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1051,7 +1050,7 @@ msgstr ""
 "entre 1 et 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1099,11 +1098,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresses IP du nom de machine\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Sortie informative :\n"
@@ -1175,12 +1174,12 @@ msgstr "l’élément racine n’est pas « locatingRules »"
 msgid "at most one input file allowed"
 msgstr "Un seul fichier est permis en entrée"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s et %s s'excluent mutuellement"
@@ -1199,7 +1198,7 @@ msgstr ""
 "msgattrib permet de filtrer les messages d'un catalogue de traduction selon leurs attributs\n"
 "et de manipuler les attributs.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1211,10 +1210,10 @@ msgstr ""
 "également\n"
 "obligatoires pour les formes courtes correspondantes.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Emplacement du fichier d'entrée :\n"
@@ -1224,10 +1223,10 @@ msgstr "Emplacement du fichier d'entrée :\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHIER                     fichier PO d'entrée\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1243,23 +1242,23 @@ msgstr ""
 "  Si le nom du fichier d'entrée est « - » ou s'il n'est pas fourni, les "
 "données sont lues depuis l'entrée standard.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Emplacement du fichier de sortie :\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1270,7 +1269,7 @@ msgstr ""
 "  Si aucun fichier n'est spécifié ou si le nom de fichier est « - »,\n"
 "  les résultats sont envoyés vers la sortie standard.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Sélection des messages :\n"
@@ -1402,9 +1401,9 @@ msgstr ""
 "      --obsolete              identique à « --only-obsolete --clear-"
 "obsolete »\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1429,17 +1428,17 @@ msgstr ""
 "      --stringtable-input     la syntaxe du fichier d'entrée est celle\n"
 "                              des fichiers « .strings » de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Détails des données de sortie :\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1454,18 +1453,18 @@ msgstr ""
 "                              QUAND peut être « always », « never », « auto "
 "», or « html ».\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=FICHIERSTYLE    spécifie le fichier de règles de style CSS "
 "pour --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1473,9 +1472,9 @@ msgstr ""
 "  -e, --no-escape             ne pas utiliser de séquences d'échappement C "
 "dans la sortie (par défaut)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1483,31 +1482,31 @@ msgstr ""
 "  -E, --escape                utiliser des séquences d'échappements C dans "
 "la sortie, sans caractère étendu\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              créer un fichier .po même s'il est vide\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                créer le fichier .po avec un style indenté\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           ne pas créer les commentaires de numérotation "
 "du type « #: fichier:ligne»\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1515,8 +1514,8 @@ msgstr ""
 "  -n, --add-location          créer des commentaires de numérotation du type "
 "« #: fichier:ligne » (par défaut)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1524,7 +1523,7 @@ msgstr ""
 "      --strict                créer des fichier .po strictement conformes à "
 "l'Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
@@ -1532,9 +1531,9 @@ msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output     créer un fichier « .properties » de type Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1542,16 +1541,16 @@ msgstr ""
 "      --stringtable-output    créer un fichier « .strings » de type NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NOMBRE          spécifier la largeur de page\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1561,33 +1560,33 @@ msgstr ""
 "plus longues\n"
 "                              que la largeur des pages de sortie.\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           trier les données de sortie\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          trier les données de sortie selon "
 "l'emplacement des fichiers\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Critère de sélection irréalisable (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1609,27 +1608,27 @@ msgstr ""
 "sauf si l'option « --use-first » est utilisée. Dans ce dernier cas,\n"
 "ils seront pris dans le premier fichier .po où ils ont été définis.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHIER ...                 fichiers d'entrée\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FICHIER    obtenir la liste des fichiers d'entrée à "
 "partir du FICHIER\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 "  Si le nom du fichier d'entrée est « - », les données sont lues depuis "
 "l'entrée standard.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1638,7 +1637,7 @@ msgstr ""
 "  -<, --less-than=N           afficher les messages définis moins de N fois\n"
 "                              (sans limite par défaut)\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1647,7 +1646,7 @@ msgstr ""
 "  ->, --more-than=N           afficher les messages définis plus de N fois\n"
 "                              (zéro par défaut, càd sans limite)\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1656,7 +1655,7 @@ msgstr ""
 "  -u, --unique                Afficher les messages uniques (identique à « --"
 "less-than=2 »)\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1665,7 +1664,7 @@ msgstr ""
 "  -P, --properties-input      la syntaxe des fichiers d'entrée est celle\n"
 "                              des fichiers « .properties » de Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1675,12 +1674,12 @@ msgstr ""
 "      --stringtable-input     la syntaxe des fichiers d'entrée est celle\n"
 "                              des fichiers « .strings » de NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ENCODAGE      encodage de sortie\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1691,7 +1690,7 @@ msgstr ""
 "                              message ; ne pas faire la fusion de plusieurs "
 "traductions\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1699,7 +1698,7 @@ msgstr ""
 "      --lang=NOMCATALOGUE      définir le champ 'Language' dans l'en-tête\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1809,19 +1808,19 @@ msgstr "Ce message est utilisé mais non défini dans « %s »"
 msgid "warning: this message is not used"
 msgstr "AVERTISSEMENT : ce message n'est pas utilisé"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d erreur fatale trouvée"
 msgstr[1] "%d erreurs fatales trouvées"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "Il faut indiquer au moins deux fichiers"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1841,7 +1840,7 @@ msgstr ""
 "ils seront pris dans le premier fichier .po où ils ont été définis.\n"
 "Les commentaires de position de tous les fichiers .po seront accumulés.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1851,7 +1850,7 @@ msgstr ""
 "N\n"
 "                              définitions (1 par défaut)\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1907,7 +1906,7 @@ msgstr ""
 "      --strict                créer une sortie strictement conforme à "
 "l'Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "Aucun fichier d'entrée n'a été fourni"
@@ -2098,121 +2097,121 @@ msgstr "      --keep-header           ne pas filtrer ni modifier l'en-tête\n"
 msgid "filter output is not terminated with a newline"
 msgstr "le filtre de sortie ne se termine pas par un retour à la ligne"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "L'argument de %s devrait être un simple caractère de ponctuation"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ordre des octets invalide (endianness) : %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 "aucun fichier d'entrée ne devrait être passé si les options %s et %s sont "
 "spécifiées"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s a besoin de l'option « -d DOSSIER »"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s a besoin de l'option « -l locale »"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s a besoin de l'option « --template template »"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s a besoin de l'option « -o fichier »"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s et %s s'excluent mutuellement dans %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s n'est valide qu'avec %s ou %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s n'est valide qu'avec %s, %s ou %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "Impossible de localiser les règles ITS pour %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s : "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d message traduit"
 msgstr[1] "%d messages traduits"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduction approximative"
 msgstr[1] ", %d traductions approximatives"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d message non traduit"
 msgstr[1] ", %d messages non traduits"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage : %s [OPTION] fichier.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "msgfmt permet de créer un catalogue binaire de messages à partir de la "
 "description textuelle des traductions.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichier.po ...              fichiers d'entrée\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode d'exécution :\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2221,7 +2220,7 @@ msgstr ""
 "  -j, --java                  mode JAVA : produire une classe Java "
 "« ResourceBundle »\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2230,14 +2229,14 @@ msgstr ""
 "      --java2                 identique à --java, mais pour Java2 (JDK 1.2 "
 "ou plus récent)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                mode C# : générer un fichier « .dll » de type ."
 "NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2246,7 +2245,7 @@ msgstr ""
 "      --csharp-resources      mode C# : produire un fichier « .resources » "
 "de type .NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2254,14 +2253,14 @@ msgstr ""
 "      --tcl                   mode TCL : produire un fichier « .msg » de "
 "type tcl/msgcat\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 "      --tcl                   mode QT : produire un fichier « .qm » de type "
 "Qt\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2269,37 +2268,37 @@ msgstr ""
 "      --desktop               Mode de saisie bureau : produire un fichier ."
 "desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   mode XML : produire un fichier XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                active le mode de conformité stricte à "
 "l'Uniforum\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "  Si le nom du fichier de sortie est « - », la sortie est envoyée vers la "
 "sortie standard\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Java :\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    nom de la ressource\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2308,7 +2307,7 @@ msgstr ""
 "  -l, --locale=LOCALE         nom de la « locale » (par exemple « fr » ou "
 "« fr_FR »)\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2317,7 +2316,7 @@ msgstr ""
 "      --source                produire un fichier .java au lieu d'un "
 "fichier .class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2325,7 +2324,7 @@ msgstr ""
 "  -d DOSSIER                  répertoire de base de la hiérarchie des "
 "classes\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2339,12 +2338,12 @@ msgstr ""
 "obligatoire. La classe est créée\n"
 "  dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Emplacement du fichier de sortie en mode C# :\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2353,7 +2352,7 @@ msgstr ""
 "  -d DOSSIER                  répertoire de base pour les fichiers .dll "
 "dépendants de la « locale »\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2363,19 +2362,19 @@ msgstr ""
 "  Le fichier .dll est créé dans le sous-répertoire (du répertoire spécifié)\n"
 "  dont le nom dépend de la « locale ».\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Tcl :\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DOSSIER                  répertoire de base des catalogues de messages "
 "de type « .msg »\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2384,23 +2383,23 @@ msgstr ""
 "  Les options « -l » et « -d » sont obligatoires.\n"
 "  Le fichier .msg est créé dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Options du mode de saisie bureau :\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "  --template=TEMPLATE         un fichier .desktop utilisé comme modèle\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DOSSIER                  répertoire de base des fichier .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2409,7 +2408,7 @@ msgstr ""
 "  -kMOT, --keyword=MOT      chercher MOT comme mot clé additionnel\n"
 "  -k, --keyword               ne pas utiliser les mots clés par défaut\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2420,27 +2419,27 @@ msgstr ""
 "les fichiers d'entrée sont lus depuis le répertoire au lieu des arguments\n"
 "de la ligne de commande.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Options du mode XML :\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NOM          reconnaître le dialect XML spécifié\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=TEMPLATE         un fichier XML utilisé comme modèle\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interprétation du fichier d'entrée :\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2452,14 +2451,14 @@ msgstr ""
 "                              --check-format, --check-header et --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          vérifier les chaînes de formatage dépendantes "
 "du langage\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2468,7 +2467,7 @@ msgstr ""
 "      --check-header          vérifier la présence et le contenu de l'en-"
 "tête\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2478,7 +2477,7 @@ msgstr ""
 "domaine\n"
 "                              et l'option « --output-file »\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2487,7 +2486,7 @@ msgstr ""
 "  -C, --check-compatibility   vérifier que le « msgfmt » de GNU se comporte "
 "comme celui de X/Open\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2498,14 +2497,14 @@ msgstr ""
 "clavier\n"
 "                                   pour les éléments de menu\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             utiliser les traductions approximatives "
 "(fuzzy) dans la sortie\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2513,7 +2512,7 @@ msgstr ""
 "  -a, --alignment=N           effectuer un alignement des chaînes à N octets "
 "(%d par défaut)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2525,7 +2524,7 @@ msgstr ""
 "                                      suivant l'ordre choisi : big, little, "
 "default (dépendant du système)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2533,90 +2532,90 @@ msgstr ""
 "      --no-hash               ne pas inclure la table de hachage dans le "
 "fichier binaire\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            afficher les statistiques de traduction\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               afficher plus d'informations\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "AVERTISSEMENT : l'en-tête du fichier .po est absent ou invalide\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "AVERTISSEMENT : la conversion d'encodage ne fonctionnera pas\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "AVERTISSEMENT : l'en-tête du fichier .po est approximatif (fuzzy)\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "AVERTISSEMENT : les versions plus anciennes de « msgfmt » génèreront une "
 "erreur à cet endroit\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "Le nom de domaine « %s » n'est pas un nom de fichier approprié"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "Le nom de domaine « %s » n'est pas un nom de fichier approprié : un préfixe "
 "sera utilisé"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "directive « domain %s » ignorée"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "Une chaîne vide « msgstr » a été ignorée"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "Une chaîne « msgstr » approximative (fuzzy) a été ignorée"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s : AVERTISSEMENT : le fichier source contient des traductions "
 "approximatives"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s n'existe pas"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existe mais ne peut être lu"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Erreur lors de la lecture de « %s »"
@@ -2868,13 +2867,13 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traductions françaises du paquet %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "Le jeu de caractères actuel « %s » n'est pas un nom d'encodage portable"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2898,7 +2897,7 @@ msgstr ""
 "Aucun jeu de caractères n'est spécifié pour le domaine « %s » dans l'en-tête "
 "du fichier d'entrée « %s »"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
@@ -2906,7 +2905,7 @@ msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "AVERTISSEMENT : "
@@ -3005,26 +3004,26 @@ msgstr ""
 "Il se peut que les données de sortie de « %s » soient incorrectes.\n"
 "Pour contourner le problème, vous pouvez définir LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "L'expression au pluriel peut produire des valeurs négatives."
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu mais l'expression au pluriel peut produire des valeurs aussi "
 "grande que %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "L'expression au pluriel peut induire une division par zéro."
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "L'expression au pluriel peut induire un débordement d'entier"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -3032,52 +3031,52 @@ msgstr ""
 "L'expression au pluriel peut produire une erreur arithmétique, probablement "
 "une division par zéro"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Essayez d'utiliser ce qui suit, valable pour %s :"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 "Le catalogue de messages contient des traductions d'expressions au pluriel"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "mais l'attribut « plural=EXPRESSION » est absent de l'en-tête"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "mais l'attribut « nplurals=ENTIER » est absent de l'en-tête"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "Valeur « nplurals » invalide"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "Expression au pluriel invalide"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "mais certains messages n'ont qu'une forme de pluriel"
 msgstr[1] "mais certains messages n'ont que %lu formes de pluriel"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "mais certains messages ont une forme de pluriel"
 msgstr[1] "mais certains messages ont %lu formes de pluriel"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -3086,105 +3085,110 @@ msgstr ""
 "il manque une entrée « Plural-Forms: nplurals=INTEGER; plural=EXPRESSION; » "
 "dans l'en-tête"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "Les chaînes « msgid » et « msgid_plural » ne débutent pas toutes les deux "
 "par « \\n »"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "Les chaînes « msgid » et « msgstr[%u] » ne débutent pas toutes les deux par "
 "« \\n »"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr ""
 "Les chaînes « msgid » et « msgstr » ne débutent pas toutes les deux par "
 "« \\n »"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "Les chaînes « msgid » et « msgid_plural » ne se terminent pas toutes les "
 "deux par « \\n »"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "Les chaînes « msgid » et « msgstr[%u] » ne se terminent pas toutes les deux "
 "par « \\n »"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr ""
 "Les chaînes « msgid » et « msgstr » ne se terminent pas toutes les deux par "
 "« \\n »"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 "La gestion des formes du pluriel est une extension de la version GNU de "
 "gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "« msgstr » n'a pas de marqueur de raccourci clavier « %c »"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "« msgstr » a trop de marqueurs de raccourcis clavier « %c »"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "Le champ d'en-tête « %s » a encore sa valeur initiale par défaut\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "Le champ « %s » est absent de l'en-tête\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "Ellipse ASCII (\"...\") plutôt qu’Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "espace avant l’ellipse trouvée dans une chaîne utilisateur visible"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "utiliser une apostrophe ASCII double plutôt qu’Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "utiliser une apostrophe ASCII simple plutôt qu’Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "Tiret ASCII (\"%c\") plutôt qu’Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s : l'entrée n'est pas valide dans l'encodage %s"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s : erreur pendant la conversion depuis l'encodage « %s » vers l'encodage « "
 "%s »"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "Aucun jeu de caractères n'a été défini dans l'en-tête du fichier d'entrée"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3193,7 +3197,7 @@ msgstr ""
 "Impossible de convertir de « %s » vers « %s ». %s s'appuie sur iconv() et "
 "celui-ci ne permet pas cette conversion."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3202,8 +3206,8 @@ msgstr ""
 "La conversion de « %s » vers « %s » introduit des doublons : certaines "
 "chaînes « msgids » différentes deviennent identiques."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3660,7 +3664,7 @@ msgstr "Fin de ligne au milieu d'une chaîne"
 msgid "context separator <EOT> within string"
 msgstr "séparateur de contexte <EOT> à l'intérieur d'une chaîne"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "Ce fichier peut ne pas contenir de directive de domaine"
@@ -3681,31 +3685,31 @@ msgstr "nom de groupe indeterminé"
 msgid "invalid non-blank character"
 msgstr "caractère non blanc invalide"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "« = » manquant après « %s »"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "ligne non vide invalide"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "Le fichier « %s » est tronqué"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "Le fichier « %s » contient une chaîne non terminée par un octet nul"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "Le fichier « %s » n'est pas au format GNU « .mo »"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
@@ -3890,25 +3894,25 @@ msgstr "Échec de compilation de la classe C#. Essayez l'option « --verbose Â
 msgid "compilation of C# class failed"
 msgstr "Échec de compilation de la classe C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "Erreur lors de l'ouverture de « %s » en écriture"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "« %s » n'est pas un nom de classe Java valide"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Échec de compilation de la classe Java. Essayez l'option « --verbose » ou "
 "définissez $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "Échec de compilation de la classe Java. Essayez de définir $JAVAC"
@@ -4023,12 +4027,12 @@ msgstr ""
 "mais le format de catalogue de type Tcl ne supporte pas les formes au "
 "pluriel\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d : AVERTISSEMENT : chaîne non terminée"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d : AVERTISSEMENT : expression rationnelle non terminée"
@@ -4048,7 +4052,7 @@ msgstr "%s:%d : AVERTISSEMENT : constante caractère sans terminaison"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code »."
@@ -4089,7 +4093,7 @@ msgstr ""
 "%s:%d : séquence d'octets multiples incomplète à la fin de la ligne.\n"
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d : Échec de « iconv »"
@@ -4103,7 +4107,7 @@ msgstr ""
 "%s:%d : séquence d'octets multiples invalide.\n"
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code ».\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
@@ -4123,40 +4127,40 @@ msgstr "%s:%d : AVERTISSEMENT : caractère « ) » trouvé à la place de «
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d : AVERTISSEMENT : caractère « } » trouvé à la place de « ) »"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 "« %s » n'est pas un nom d'encodage valide. ASCII a été utilisé à la place.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "vérification de syntaxe « %s » inconnue"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "sentence de fin de type « %s » inconnue"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "L'option « --join-existing » ne peut pas être utilisée pour l'écriture sur "
 "la sortie standard"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne peut pas fonctionner sans mot clé à rechercher"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "AVERTISSEMENT : le fichier de règle ITS « %s » n’existe pas"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -4164,21 +4168,21 @@ msgstr ""
 "AVERTISSEMENT : le fichier de règle ITS « %s » n’existe pas ; vérifiez votre "
 "installation de gettext"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "AVERTISSEMENT : pour le fichier « %s », l'extension « %s » est inconnue. On "
 "suppose que c'est du C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "xgettext analyse des fichiers de code source et permet d'en extraire les "
 "chaînes qui peuvent être traduites dans d'autres langues.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4187,13 +4191,13 @@ msgstr ""
 "  -d, --default-domain=NOM    utiliser NOM.po pour la sortie (au lieu de "
 "messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FICHIER        écrire la sortie dans le FICHIER spécifié\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4201,12 +4205,12 @@ msgstr ""
 "  -p, --output-dir=RÉP        créer les fichiers de sortie dans le "
 "répertoire spécifié\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choix du langage du fichier d'entrée :\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4227,12 +4231,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   identique à « --language=C++ »\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4240,7 +4244,7 @@ msgid ""
 msgstr ""
 "  Par défaut, le langage est deviné selon l'extension du nom du fichier.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4249,25 +4253,25 @@ msgstr ""
 "      --from-code=NOM         encodage des fichiers d'entrée\n"
 "                              (sauf pour Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "  Par défaut les fichiers d'entrée sont supposés être en ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            joindre les messages au fichier existant\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FICHIER.po  les entrées du FICHIER.po ne sont pas "
 "extraites\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4284,18 +4288,18 @@ msgstr ""
 "précédant les lignes de mots clés\n"
 "                                dans le fichier de sortie\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NOM             vérifier la syntaxe des messages\n"
 "                                (ellipsis-unicode, ellipsis-espace,\n"
-"                                 apostrophe-unicode)\n"
+"                                 apostrophe-unicode, tiret-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4306,17 +4310,17 @@ msgstr ""
 "                                (espace-simple, par défaut, \n"
 "                                 ou espace-double)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Options spécifiques au langage:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extraire toutes les chaînes\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4332,7 +4336,7 @@ msgstr ""
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                              Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4348,7 +4352,7 @@ msgstr ""
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                              Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4359,7 +4363,7 @@ msgstr ""
 "l'intérieur de\n"
 "                              l'argument numéro ARG du MOT clé\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4375,42 +4379,53 @@ msgstr ""
 "                              C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                              Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             comprendre les trigrammes ANSI C pour "
 "l'entrée\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                              (seuls les langages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=FILE              appliquer les règles ITS du FICHIER\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+"                              (seulement les langages de la famille XML)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconnaître les chaînes au format Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                              (seulement le langage C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 "      --kde                   reconnaître les chaînes au format KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 "      --boost                 reconnaître les chaînes au format Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4418,31 +4433,26 @@ msgstr ""
 "      --debug                 mieux détailler la reconnaissance des chaînes "
 "de format\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     produire un fichier « .properties » de type "
 "Java\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=FILE              appliquer les règles ITS du FICHIER\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 "      --itstool               envoyer sur la sortie les commentaires "
 "d’itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=AUTEUR  définit l'auteur dans la sortie\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4450,18 +4460,18 @@ msgstr ""
 "      --foreign-user          omettre le copyright FSF dans la sortie pour "
 "les utilisateurs étrangers\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAQUET   donne le nom de paquet dans la sortie\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSION  donne la version du paquet dans la sortie\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4469,7 +4479,7 @@ msgstr ""
 "      --msgid-bugs-address=ADRESSE@COURRIEL  adresse de courriel pour les "
 "rapport d'anomalie des msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4480,7 +4490,7 @@ msgstr ""
 "préfixe aux valeurs\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4491,7 +4501,7 @@ msgstr ""
 "suffixe aux valeurs\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4500,31 +4510,31 @@ msgstr ""
 "Un argument « --flag » n'a pas la syntaxe <mot_clé>:<n°_argument>:"
 "[pass-]<drapeau>:%s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "entrée standard"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Caractère non-ASCII à %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Commentaire non-ASCII à (ou avant) %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Chaîne non-ASCII à %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s : AVERTISSEMENT : "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4533,7 +4543,7 @@ msgstr ""
 "Malgré sa position, %s n'est pas une chaîne de format %s valide. La raison "
 "est :%s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4542,7 +4552,7 @@ msgstr ""
 "Malgré sa déclaration, %s n'est pas une chaîne de format %s valide. La "
 "raison est :%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4556,7 +4566,7 @@ msgstr ""
 "Envisagez d'utiliser une chaîne de format contenant des arguments nommés,\n"
 "et un mapping plutôt qu'un tuple pour les arguments.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4566,30 +4576,30 @@ msgstr ""
 "GNU gettext : gettext(\"\") retourne l'en-tête\n"
 "avec les informations de contexte, pas une chaîne vide.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "Argument ambigu pour le mot clé « %.*s »"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "AVERTISSEMENT : contexte absent pour le mot clé « %.*s »"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "AVERTISSEMENT : contexte absent pour l'argument de pluriel du mot clé « %.*s "
 "»"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 "incohérence de contexte entre la forme du singulier et celle du pluriel"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4601,7 +4611,7 @@ msgstr ""
 "la variable MSGID_BUGS_ADDRESS à cet endroit. Sinon, veuillez\n"
 "utiliser l'option « --msgid-bugs-address » en ligne de commande.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "langage « %s » inconnu"
@@ -4717,7 +4727,7 @@ msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d : interpolation invalide (« \\U ») de caractères de 8 bits « %c »"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4726,7 +4736,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4738,7 +4748,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4750,7 +4760,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4762,7 +4772,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4774,7 +4784,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page : http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4786,22 +4796,22 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Encodage « %s » inconnu. Traitement effectué en ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d : définition de chaîne invalide"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d : nombre manquant après « # »"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d : expression chaîne invalide"
diff --git a/gettext-tools/po/gettext-tools.pot b/gettext-tools/po/gettext-tools.pot
index 88d13f3..f75564d 100644
--- a/gettext-tools/po/gettext-tools.pot
+++ b/gettext-tools/po/gettext-tools.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.7\n"
+"Project-Id-Version: gettext-tools 0.19.8.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -109,7 +109,7 @@ msgid "Unknown system error"
 msgstr ""
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -187,15 +187,15 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -218,39 +218,39 @@ msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -289,18 +289,18 @@ msgstr ""
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr ""
@@ -332,11 +332,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
@@ -356,7 +356,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -369,21 +369,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr ""
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -393,20 +393,20 @@ msgstr ""
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -416,10 +416,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
@@ -450,37 +450,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr ""
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr ""
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -514,8 +514,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -804,8 +803,8 @@ msgstr ""
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
@@ -822,57 +821,57 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -920,7 +919,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -965,11 +964,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
@@ -1041,12 +1040,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr ""
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
@@ -1063,7 +1062,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1072,10 +1071,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
@@ -1085,10 +1084,10 @@ msgstr ""
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1100,23 +1099,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1125,7 +1124,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -1230,9 +1229,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1253,17 +1252,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1272,118 +1271,118 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1397,51 +1396,51 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1449,26 +1448,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1565,19 +1564,19 @@ msgstr ""
 msgid "warning: this message is not used"
 msgstr ""
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1590,14 +1589,14 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1642,7 +1641,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr ""
@@ -1804,206 +1803,206 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr ""
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr ""
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr ""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2012,65 +2011,65 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2078,27 +2077,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2106,33 +2105,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2140,18 +2139,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2160,89 +2159,89 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr ""
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr ""
@@ -2421,12 +2420,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2444,14 +2443,14 @@ msgid ""
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2520,176 +2519,181 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr ""
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr ""
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3059,7 +3063,7 @@ msgstr ""
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
@@ -3080,31 +3084,31 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr ""
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr ""
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr ""
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr ""
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr ""
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
@@ -3270,23 +3274,23 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr ""
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3369,12 +3373,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr ""
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
@@ -3394,7 +3398,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3426,7 +3430,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3438,7 +3442,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3458,76 +3462,76 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3540,41 +3544,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3584,15 +3588,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3600,17 +3604,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3620,7 +3624,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3630,7 +3634,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3638,7 +3642,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3648,85 +3652,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3734,7 +3743,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3742,52 +3751,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3796,34 +3805,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3831,7 +3840,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr ""
@@ -3930,13 +3939,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3944,7 +3953,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3952,7 +3961,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3960,7 +3969,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3968,7 +3977,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3976,22 +3985,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
diff --git a/gettext-tools/po/gl.gmo b/gettext-tools/po/gl.gmo
index b976044..cf82b8d 100644
--- a/gettext-tools/po/gl.gmo
+++ b/gettext-tools/po/gl.gmo
diff --git a/gettext-tools/po/gl.po b/gettext-tools/po/gl.po
index 7b9cdfd..45bc80e 100644
--- a/gettext-tools/po/gl.po
+++ b/gettext-tools/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2014-05-20 13:35+0200\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -116,7 +116,7 @@ msgid "Unknown system error"
 msgstr "Erro de sistema descoñecido"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, fuzzy, c-format
 msgid "%s subprocess failed"
@@ -194,15 +194,15 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "produciuse un erro ao crear «%s»"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -228,39 +228,39 @@ msgid "%s subprocess I/O error"
 msgstr "Erro de E/S do subproceso %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esgotada"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "produciuse un erro ao crear os fíos"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "produciuse un erro ao escribir ao subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "produciuse un erro ao ler do subproceso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -299,18 +299,18 @@ msgstr "»"
 msgid "setting permissions for %s"
 msgstr "definindo os permisos de %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "non é posíbel crear a canalización"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle fallou"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "non foi posíbel restaurar o fd %d: dup2 fallou"
@@ -342,11 +342,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Use «%s --help» para obter máis información.\n"
@@ -366,7 +366,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -379,21 +379,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  Mostra esta mensaxe de axuda e sae\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               Mostra a información da versión e sae\n"
@@ -403,20 +403,20 @@ msgstr "  -V, --version               Mostra a información da versión e sae\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -426,10 +426,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -460,18 +460,18 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "produciuse un erro ao abrir «%s» para lectura"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -480,19 +480,19 @@ msgstr ""
 "en «%s»"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "unha especificación de formato para o argumento %u non existe en «%s»"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -528,8 +528,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "o número de especificacións de formato en «%s» e «%s» non coincide"
@@ -826,8 +825,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "as especificacións de formato en «%s» non son un subconxunto das de «%s»"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
@@ -845,51 +844,51 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -897,7 +896,7 @@ msgstr ""
 "unha especificación de formato para o argumento «%s», como en «%s», non "
 "existe en «%s»"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -947,7 +946,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -992,11 +991,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Saída informativa:\n"
@@ -1068,12 +1067,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "permítese un ficheiro de entrada como moito"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s son mutuamente excluíntes"
@@ -1090,7 +1089,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1099,10 +1098,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
@@ -1112,10 +1111,10 @@ msgstr ""
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1127,23 +1126,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1152,7 +1151,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selección de mensaxes:\n"
@@ -1257,9 +1256,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1280,17 +1279,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1299,118 +1298,118 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "o criterio de selección indicado é imposíbel (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1432,51 +1431,51 @@ msgstr ""
 "ficheiro, para definilos. Mantéñense as posicións nos ficheiros de todos\n"
 "os ficheiros PO.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1484,26 +1483,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1607,19 +1606,19 @@ msgstr "esta mensaxe úsase mais non está definida en %s"
 msgid "warning: this message is not used"
 msgstr "aviso: esta mensaxe non se usa"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "atopouse %d erro grave"
 msgstr[1] "atopáronse %d erros graves"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "téñense que indicar polo menos dous ficheiros"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1640,14 +1639,14 @@ msgstr ""
 "ficheiro, para definilos. Mantéñense as posicións nos ficheiros de todos\n"
 "os ficheiros PO.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1692,7 +1691,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "non se indicou ningún ficheiro de entrada"
@@ -1854,206 +1853,206 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "o ficheiro «%s» contén unha cadea non terminada en NUL"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s e %s son mutuamente excluíntes en %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "non é posíbel crear o ficheiro de saída «%s»"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensaxe traducida"
 msgstr[1] "%d mensaxes traducidas"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d tradución dubidosa"
 msgstr[1] ", %d traducións dubidosas"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensaxe sen traducir"
 msgstr[1] ", %d mensaxes sen traducir"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operación:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "                                (só linguaxe C++)\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2062,65 +2061,65 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2128,27 +2127,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2156,33 +2155,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2190,18 +2189,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2210,91 +2209,91 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "aviso: a conversión de xogo de caracteres non vai funcionar\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "o nome de dominio «%s» non é axeitado para nome de ficheiro"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "o nome de dominio «%s» non é axeitado como nome de ficheiro:\n"
 "empregarase un prefixo"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "ignorouse a directiva «domain %s»"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "ignorouse a entrada «msgstr» baleira"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ignorouse a entrada «msgstr» dubidosa"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: o ficheiro fonte contén traducións dubidosas"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "produciuse un erro ao ler «%s»"
@@ -2473,12 +2472,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2496,14 +2495,14 @@ msgid ""
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "aviso: "
@@ -2572,165 +2571,170 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "valor de nplurals incorrecto"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "pero algunhas mensaxes só teñen unha forma plural"
 msgstr[1] "pero algunhas mensaxes só teñen %lu formas plurais"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "as entradas «msgid» e «msgid_plural» non comezan ámbalas dúas con «\\n»"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "as entradas «msgid» e «msgstr[%u]» non comezan ámbalas dúas con «\\n»"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "as entradas «msgid» e «msgstr» non comezan ámbalas dúas con «\\n»"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "as entradas «msgid» e «msgid_plural» non rematan ámbalas dúas con «\\n»"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "as entradas «msgid» e «msgstr[%u]» non rematan ámbalas dúas con «\\n»"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "as entradas «msgid» e «msgstr» non rematan ámbalas dúas con «\\n»"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "o campo «%s» da cabeceira aínda ten o valor inicial predefinido\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "falta o campo «%s» na cabeceira\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: produciuse un erro ao converter desde a codificación «%s» á codificación "
 "«%s»"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2739,15 +2743,15 @@ msgstr ""
 "Non é posíbel converter desde «%s» a «%s». %s depende de iconv(), e iconv() "
 "non admite esta conversión."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3142,7 +3146,7 @@ msgstr "fin de liña nunha cadea"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro non pode conter directivas de dominio"
@@ -3164,32 +3168,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr "aviso: carácter Unicode incorrecto"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "falta o nome do filtro"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "valor de nplurals incorrecto"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "o ficheiro «%s» está truncado"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "o ficheiro «%s» contén unha cadea non terminada en NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "o ficheiro «%s» non está no formato .mo de GNU"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "o ficheiro «%s» contén unha cadea non terminada en NUL, en %s"
@@ -3356,23 +3360,23 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "produciuse un erro ao abrir «%s» para escribir"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "non é un nome de clase Java válido: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3457,12 +3461,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: aviso: cadea non rematada"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: aviso: expresión regular non rematada"
@@ -3482,7 +3486,7 @@ msgstr "%s:%d: aviso: constante de tipo carácter non rematada"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3514,7 +3518,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: fallo de iconv"
@@ -3526,7 +3530,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: aviso: carácter Unicode incorrecto"
@@ -3546,77 +3550,77 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "linguaxe «%s» descoñecida"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "non é posíbel usar --join-existing cando a saída se escribe en stdout"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext non funciona sen palabras clave polas que buscar"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "aviso: o ficheiro «%s» coa extensión «%s» é descoñecido; tentarase con C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3629,41 +3633,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3673,15 +3677,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3689,17 +3693,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3709,7 +3713,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3719,7 +3723,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3727,7 +3731,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3737,85 +3741,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (só linguaxe C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (só linguaxe C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "  def.po                      traducións\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3823,7 +3832,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3831,52 +3840,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: aviso: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3885,34 +3894,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3920,7 +3929,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "linguaxe «%s» descoñecida"
@@ -4019,13 +4028,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4033,7 +4042,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4041,7 +4050,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4049,7 +4058,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4057,7 +4066,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4065,22 +4074,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
diff --git a/gettext-tools/po/id.gmo b/gettext-tools/po/id.gmo
index d083f52..d117d11 100644
--- a/gettext-tools/po/id.gmo
+++ b/gettext-tools/po/id.gmo
diff --git a/gettext-tools/po/id.po b/gettext-tools/po/id.po
index 84f48a1..c2dffde 100644
--- a/gettext-tools/po/id.po
+++ b/gettext-tools/po/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2010-05-24 13:30+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -111,7 +111,7 @@ msgid "Unknown system error"
 msgstr "Sistem error tidak diketahui"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -189,15 +189,15 @@ msgstr "argumen source_version tidak valid untuk compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argumen target_version tidak valid untuk compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "gagal untuk membuat \"%s\""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -220,39 +220,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s subproses I/O error"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "kehabisan memori"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, fuzzy, c-format
 msgid "creation of threads failed"
 msgstr "kompilasi dari kelas C# gagal"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "tulis ke %s subproses gagal"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "baca dari %s subproses gagal"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "tidak dapat mengkonfigurasikan nonblocking I/O ke %s subproses"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "komunikasi dengan %s subproses gagal"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s subproses berakhir dengan kode keluar %d"
@@ -291,18 +291,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "tidak dapat membuat pipe"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle gagal"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "tidak dapat mengembalikan deskripsi berkas %d: dup2 gagal"
@@ -334,11 +334,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
@@ -358,7 +358,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -373,21 +373,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               keluarkan informasi versi dan keluar\n"
@@ -397,20 +397,20 @@ msgstr "  -V, --version               keluarkan informasi versi dan keluar\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -424,10 +424,10 @@ msgstr ""
 "TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
@@ -458,18 +458,18 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error ketika membuka \"%s\" untuk dibaca"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -478,19 +478,19 @@ msgstr ""
 "dalam '%s'"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "sebuah spesifikasi format untuk argumen %u tidak ada dalam '%s'"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -530,8 +530,7 @@ msgstr ""
 "%u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "jumlah spesifikasi format dalam '%s' dan '%s' tidak cocok"
@@ -864,8 +863,8 @@ msgstr "spesifikasi format dalam '%s' dan `%s' tidak sesuai"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "spesifikasi format dalam '%s' bukan sebuah subset dari '%s'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "spesifikasi format untuk argumen '%s' tidak ada dalam '%s'"
@@ -884,29 +883,29 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "Dalam direktif nomor %u, '%c' tidak diikuti oleh sebuah digit."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "Dalam direktif nomor %u, '{' tidak diikuti dengan sebuah nomor argumen."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "Dalam direktif nomor %u, '%c' tidak diikuti oleh sebuah digit."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "Dalam direktif nomor %u, sebuah presisi tidak diijinkan sebelum '%c'. "
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, fuzzy, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "Dalam direktif nomor %u, argumen %d negatif."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -914,14 +913,14 @@ msgstr ""
 "String mereferensikan argumen baik melalui nama argumen dan melalui "
 "spesifikasi argumen tidak bernama."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "String mereferensikan ke argumen bernama '%s' dalam cara yang tidak "
 "kompatibel."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -929,7 +928,7 @@ msgstr ""
 "spesifikasi format dalam '%s' diduga sebuah pemetaan, baik dalam '%s' diduga "
 "sebuah tuple"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -937,7 +936,7 @@ msgstr ""
 "spesifikasi format dalam '%s' diduga sebuah tuple, baik dalam '%s' diduga "
 "sebuah pemetaan"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -945,7 +944,7 @@ msgstr ""
 "spesifikasi format untuk argumen '%s', seperti dalam '%s', tidak ada dalam "
 "'%s'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1004,7 +1003,7 @@ msgstr ""
 "9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1052,11 +1051,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            alamat untuk hostname\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Keluaran informatif:\n"
@@ -1128,12 +1127,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "di paling tidak satu berkas masukan diijinkan"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s dan %s adalah mutually exclusive"
@@ -1152,7 +1151,7 @@ msgstr ""
 "Saring pesan dari sebuah katalog terjemahan menurut atributnya,\n"
 "dan manipulasi atribut.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1162,10 +1161,10 @@ msgid ""
 msgstr ""
 "Argumen wajib untuk pilihan panjang juga wajib untuk pilihan pendek juga.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Lokasi berkas masukan:\n"
@@ -1175,10 +1174,10 @@ msgstr "Lokasi berkas masukan:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1194,17 +1193,17 @@ msgstr ""
 "Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
 "masukan yang dibaca.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Lokasi berkas keluaran:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
@@ -1212,7 +1211,7 @@ msgstr ""
 "  -o, --output-file=BERKAS    tulis keluaran ke berkas yang "
 "dispesifikasikan\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1223,7 +1222,7 @@ msgstr ""
 "Hasil ditulis ke standar keluaran jika tidak ada berkas keluaran yang\n"
 "dispesifikasikan atau jika ini adalah -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Pemilihan pesan:\n"
@@ -1342,9 +1341,9 @@ msgstr ""
 "      --obsolete               sinonim untuk --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1369,17 +1368,17 @@ msgstr ""
 "      --stringtable-input     berkas masukan berada dalam sintaks .strings "
 "NexTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Detil keluaran:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1393,27 +1392,27 @@ msgstr ""
 "                              KETIKA dapat berupa 'always', 'never', 'auto', "
 "atau 'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=BERKAS GAYA     spesifikasikan aturan gaya CSS berkas untuk --"
 "color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             jangan gunakan C escape dalam keluaran (baku)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1421,69 +1420,69 @@ msgstr ""
 "  -E, --escape                gunakan C escape dalam keluaran, bukan "
 "karakter ekstensi\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              tulis berkas PO walaupun itu kosong\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                tulis berkas .po menggunakan gaya teridentasi\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           jangan tulis '#: nama berkas:baris' baris\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          hasilkan '#: nama berkas:baris' baris (baku)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                tulis strict Uniforum konform berkas .po\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     tulis sebuah berkas .properties Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    tulis sebuah .string berkas NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANGKA           set keluaran lebar halaman\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1494,33 +1493,33 @@ msgstr ""
 "                              dari lebar halaman keluaran, dalam beberapa "
 "beris\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           hasilkan keluaran terurut\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 "kriteria pemilihan yang dispesifikasikan tidak memungkinkan (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1542,25 +1541,25 @@ msgstr ""
 "komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
 "mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan dijaga.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  BERKAS MASUKAN ...          berkas masukan\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=BERKAS     dapatkan daftar dari berkas masukan dari "
 "BERKAS\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jika berkas masukan adalah -, standar masukan dibaca.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1570,7 +1569,7 @@ msgstr ""
 "                              definisi ini, baku ke tidak terhingga jika "
 "tidak diset\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1579,7 +1578,7 @@ msgstr ""
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih besar dari \n"
 "                              definisi ini, baku ke 0 jika tidak diset\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1588,7 +1587,7 @@ msgstr ""
 "  -u, --unique                kependekan untuk --less-than=2, diminta\n"
 "                              hanya pesan unik untuk ditampilkan\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1597,7 +1596,7 @@ msgstr ""
 "  -P, --properties-input      berkas masukan berada dalam sintaks ."
 "properties Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1607,12 +1606,12 @@ msgstr ""
 "      --stringtable-input     berkas masukan berada dalam sintaks .strings "
 "NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAMA          pengkodean untuk keluaran\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1623,7 +1622,7 @@ msgstr ""
 "                              setiap pesan, jangan gabungkan beberapa "
 "terjemahan.\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1631,7 +1630,7 @@ msgstr ""
 "      --lang=NAMAKATALOG      isi baris 'Language' dalam masukan header\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter MIller"
 
@@ -1737,19 +1736,19 @@ msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
 msgid "warning: this message is not used"
 msgstr "peringatan: pesan ini tidak digunakan"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "ditemukan %d kesalahan fatal"
 msgstr[1] "ditemukan %d kesalahan fatal"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "paling tidak dua berkas harus dispesifikasikan"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1769,7 +1768,7 @@ msgstr ""
 "komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
 "mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan diakumulasikan.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1778,7 +1777,7 @@ msgstr ""
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih dari definisi\n"
 "                              ini, baku ke 1 jika tidak diset\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1827,7 +1826,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                gaya keluaran Uniforum strict\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "tidak ada berkas masukan yang diberikan"
@@ -2013,119 +2012,119 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "berkas \"%s\" berisi bukan sebuah string berakhir NULL"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumen ke %s seharusnya berupa sebuah karakter punctuation tunggal"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "endianness tidak valid: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, fuzzy, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 "Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
 "masukan yang dibaca.\n"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-d direktori\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, fuzzy, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, fuzzy, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s dan %s adalah mutually exclusive"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s hanya valid dengan %s atau %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s hanya valid dengan %s, %s atau %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "tidak dapat membuat berkas output \"%s\""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d pesan diterjemahkan"
 msgstr[1] "%d pesan diterjemahkan"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d terjemahan fuzzy"
 msgstr[1] ", %d terjemahan fuzzy"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d pesan belum diterjemahkan"
 msgstr[1] ", %d pesan belum diterjemahkan"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Penggunaan: %s [PILIHAN] nama-berkas.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Hasilkan katalog pesan binari dari deskripsi tekstual terjemahan.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nama-berkas.po ...           berkas masukan\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode operasi:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2134,7 +2133,7 @@ msgstr ""
 "  -j, --java                  Mode: java menghasilkan sebuah class Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2143,13 +2142,13 @@ msgstr ""
 "      --java2                 seperti --java, dan asumsikan Java2 (JDK 1.2 "
 "atau lebih tinggi)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                C# mode: hasilkan sebuah berkas .dll .NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2158,50 +2157,50 @@ msgstr ""
 "      --csharp-resources      mode resources C#: hasilkan sbeuah berkas ."
 "resources .NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   mode Tcl: hasilkan sebuah .tcl/msgcat\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, fuzzy, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                aktifkan mode strict Uniforum\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Jika keluaran berkas adalah -, keluaran ditulis ke standar keluaran.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Lokasi berkas keluaran dalam mode Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     nama resource\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2209,7 +2208,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOKAL          nama lokal, baik bahasa atau bahasa_NEGARA\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, fuzzy, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2218,14 +2217,14 @@ msgstr ""
 "      --tcl                   mode Tcl: masukan adalah sebuah berkas .msg "
 "tcl/msgcat\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIREKTORI                basis direktori dari struktur direktori kelas\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2238,12 +2237,12 @@ msgstr ""
 "dibawah\n"
 "direktoris yang dispesifikasikan.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2252,7 +2251,7 @@ msgstr ""
 "  -d DIREKTORI                basis direktori untuk lokal dependen berkas ."
 "dll\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2261,18 +2260,18 @@ msgstr ""
 "Pilihan -l dan -d wajib. Berkas .dll ditulis dalam sebuah subdirektori\n"
 "dari direktori yang dispesifikasikan yang namanya tergantung dari lokal.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIREKTORI                basis direktori dari katalog pesan .msg\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2281,23 +2280,23 @@ msgstr ""
 "Pilihan -l dan -d wajib. Berkas .msg ditulis dalam direktori yang "
 "dispesifikasikan.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, fuzzy, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 "  -d DIREKTORI                basis direktori dari katalog pesan .msg\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2306,7 +2305,7 @@ msgstr ""
 "  -kKATA, --keyword=KATA      cari untuk KATA sebagai kata kunci tambahan\n"
 "  -k, --keyword               jangan gunakan untuk kata kunci baku\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2314,27 +2313,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretasi masukan berkas:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2346,13 +2345,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          periksa format string tergantung bahasa\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2361,7 +2360,7 @@ msgstr ""
 "      --check-header          verifikasi keberadaan dan isi dari masukan "
 "header\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2371,7 +2370,7 @@ msgstr ""
 "domain\n"
 "                               dan pilihan --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2380,7 +2379,7 @@ msgstr ""
 "  -C, --check-compatibility   periksa GNU msgfmt berlaku seperti X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2390,19 +2389,19 @@ msgstr ""
 "      --check-accelerators[=CHAR]  periksa keberadaan dari akselerator\n"
 "                                keyboard untuk item menu\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             gunakan masukan fuzzy dalam keluaran\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=JUMLAH       align string ke JUMLAH bytes (baku: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2411,7 +2410,7 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2419,87 +2418,87 @@ msgstr ""
 "      --no-hash               berkas binari tidak akan dimasukan dalam tabel "
 "hash\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            tampilkan statistik mengenai terjemahan\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               naikan tingkat keramaian\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "peringatan: header berkas PO hilang atau tidak valid\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "peringatan: konversi set karakter tidak akan bekerja\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "peringatan: header berkas PO fuzzy\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "peringatan: versi lebih lama dari msgfmt akan memberikan sebuah error "
 "disini\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nama domain \"%s\" tidak sesuai dengan nama berkas"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nama domain \"%s\" tidak sesuai dengan nama berkas: akan menggunakan prefix"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direktif `domain %s' diabaikan"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "masukan `msgstr' kosong diabaikan"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "masukan fuzzy `msgstr' diabaikan"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: peringatan: berkas sumber mengandung terjemahan fuzzy"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
@@ -2746,13 +2745,13 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Terjemahan bahasa inggris untuk paket %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "set karakter saat ini \"%s\" bukan sebuah nama pengkodean yang portabel"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dua set karakter berbeda \"%s\" dan \"%s\" dalam berkas masukan"
@@ -2774,14 +2773,14 @@ msgstr ""
 "domain \"%s\" dalam berkas masukan `%s' tidak berisi sebuah masukan header "
 "dengan sebuah spesifikasi set karakter"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "target set karakter \"%s\" bukan sebuah nama pengkodean yang portabel."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "peringatan: "
@@ -2876,26 +2875,26 @@ msgstr ""
 "Keluaran dari '%s' mungkin tidak benar.\n"
 "Solusi yang memungkinkan adalah menset LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "ekspresi plural dapan menghasilkan nilai minus"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu tetapi ekspresi plural dapan menghasilkan nilai besar sebesar "
 "%lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "ekspresi plural dapan menghasilkan pembagian dengan nol"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "ekspresi plural dapat menghasilkan integer overflow"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2903,51 +2902,51 @@ msgstr ""
 "ekspresi plural dapat menghasilkan eksepsi aritmetik, kemungkinan pembagian "
 "dengan nol"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Coba gunakan berikut, valid untuk %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "katalog pesan memiliki bentuk terjemahan plural"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "tetapi masukan header kurang sebuah atribut \"plural=EKSPRESI\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "tetapi masukan header kurang sebuah atribut \"plurals=BILANGAN BULAT\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "nilai nplurals tidak valid"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ekspresi plural tidak valid"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "tetapi beberapa pesan hanya memiliki bentuk %lu plural"
 msgstr[1] "tetapi beberapa pesan hanya memiliki bentuk %lu plural"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "tetapi beberapa pesan memiliki bentuk %lu plural"
 msgstr[1] "tetapi beberapa pesan memiliki bentuk %lu plural"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2956,95 +2955,100 @@ msgstr ""
 "masukan header dengan \"Plural-Forms: nplurals=BILANG BULAT; plural=EKSPRESI;"
 "\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgid_plural' keduanya tidak dimulai dengan '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr[%u]' keduanya tidak dimulai dengan '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' keduanya tidak dimulai dengan '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "masukan `msgid' dan `msgid_plural' keduanya tidak diakhiri dengan '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr[%u]' keduanya tidak diakhiri dengan '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "masukan `msgid' dan `msgstr' keduanya tidak diakhiri dengan '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "penanganan plural adalah sebuah ekstensi GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr kuran tanda akselerasi keyboard '%c'"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr memiliki terlalu banyak tanda akselerasi keyboard '%c'"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "beberapa field header `%s' masih memiliki nilai baku awal\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "header field `%s' hilang dalam header\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: masukan tidak valid dalam pengkodean \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: error ketika mengubah dari pengkodean \"%s\" ke pengkodean \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "berkas masukan tidak berisi sebuah masukan header dengan sebuah spesifikasi "
 "set karakter"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3053,7 +3057,7 @@ msgstr ""
 "Tidak dapat mengubah dari \"%s\" ke \"%s\". %s mengandalkan iconv(), dan "
 "iconv() tidak mendukung konversi ini."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3062,8 +3066,8 @@ msgstr ""
 "Pengubahan dari \"%s\" ke \"%s\" menghadirkan duplikasi: beberapa msgids "
 "berbeda menjadi sama."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3497,7 +3501,7 @@ msgstr "akhir-dari-baris dalam string"
 msgid "context separator <EOT> within string"
 msgstr "konteks pemisah <EOT> dalam string"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "berkas ini tidak boleh mengandung direktif domain"
@@ -3518,32 +3522,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "hilang nama penyaring"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "nilai nplurals tidak valid"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "berkas \"%s\" terpotong"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "berkas \"%s\" berisi bukan sebuah string berakhir NULL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "berkas \"%s\" bukan tidak berada dalam format GNU .mo"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "berkas \"%s\" berisi bukan string berakhir NULL, di %s"
@@ -3725,23 +3729,23 @@ msgstr "kompilasi dari kelas C# gagal, mohon coba --verbose"
 msgid "compilation of C# class failed"
 msgstr "kompilasi dari kelas C# gagal"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "error ketika membuka \"%s\" untuk ditulis"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "bukan sebuah nama kelas Java yang valid: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "kompilasi dari kelas Java gagal, mohon coba --verbose atau set $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilasi dari kelas Java gagal, mohon coba set $JAVAC"
@@ -3851,12 +3855,12 @@ msgstr ""
 "katalog pesan memiliki bentuk terjemahan plural\n"
 "tetapi format katalog pesan Tcl tidak mendukung penanganan plural\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: peringatan: string tidak terselesaikan"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: peringatan: ekspresi biasa tidak terselesaikan"
@@ -3876,7 +3880,7 @@ msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Mohon spesifikasikan sumber pengkodean melalui --from-code."
 
@@ -3916,7 +3920,7 @@ msgstr ""
 "%s:%d: Urutan multibyte tidak lengkap diakhir dari baris.\n"
 "Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv gagal"
@@ -3930,7 +3934,7 @@ msgstr ""
 "%s:%d: Urutan multibyte tidak valid.\n"
 "Mohon spesifikasikan sumber pengkodean melalui --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
@@ -3950,54 +3954,54 @@ msgstr "%s:%d: peringatan: ')' ditemukan dimana '}' diduga"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: peringatan: '}' ditemukan dimana ')' diduga"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext tidak dapat bekerja tanpa kata kunci untuk dicari"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "peringatan: berkas `%s' ekstensi `%s' tidak dikenal; akan mencoba C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Ekstrak string yang dapat diterjemahkan dari masukan berkas yang diberikan.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4006,14 +4010,14 @@ msgstr ""
 "  -d, --default-domain=NAMA   gunakan NAMA.po untuk keluaran (daripada "
 "messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=BERKAS         tulis keluaran ke berkas yang "
 "dispesifikasikan\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4021,12 +4025,12 @@ msgstr ""
 "  -p, --output-dir=DIR        keluarkan berkas akan ditempatkan dalam "
 "direktori DIR\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Pilihan dari masukan bahasa berkas:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4046,12 +4050,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kependekan untuk --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4059,7 +4063,7 @@ msgid ""
 msgstr ""
 "Secara baku bahasa ditebak tergantung dari ekstensi masukan nama berkas.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4068,24 +4072,24 @@ msgstr ""
 "      --from-code=NAMA        pengkodean dari berkas masukan\n"
 "                                (kecuali untuk Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Secara baku berkas masukan diasumsikan berada dalam ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         gabungkan pesan dengan berkas yang sudah ada\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=BERKAS.po masukan dari BERKAS.po tidak diekstraksi\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4102,15 +4106,15 @@ msgstr ""
 "kata kunci\n"
 "                              dalam berkas keluaran\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4118,17 +4122,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Pilihan spesifik untuk bahasa:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ekstrak seluruh string\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4142,7 +4146,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4156,7 +4160,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4166,7 +4170,7 @@ msgstr ""
 "      --flag=WORD:ARG:FLAG    simbol tambahan untuk string didalam argumen\n"
 "                              nomor ARG dari kata kunci KATA\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4180,68 +4184,73 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             pahami ANSI C trigraphs untuk masukan\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (hanya bahasa C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=BERKAS     dapatkan daftar dari berkas masukan dari "
+"BERKAS\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (hanya bahasa C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    kenali format string Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (hanya bahasa C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   kenali format string KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 kenali format string Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 lebih detil hasil pengenalan format string\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     tulis keluar sebuah berkas .properties Java\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=BERKAS     dapatkan daftar dari berkas masukan dari "
-"BERKAS\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "     --indent                 gaya keluaran terindentasi\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=STRING  set pemegang hak cipta dalam keluaran\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4249,17 +4258,17 @@ msgstr ""
 "      --foreign-user          abaikan FSF hak cipta dalam keluaran untuk "
 "pengguna luar negri\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    set nama paket dalam keluaran\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSI    set versi paket dalam keluaran\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4267,7 +4276,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@ALAMAT   set alamat laporan untuk msgid "
 "bugs\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4278,7 +4287,7 @@ msgstr ""
 "awalan\n"
 "                                untuk nilai msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4289,7 +4298,7 @@ msgstr ""
 "akhiran\n"
 "                                untuk nilai msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4298,31 +4307,31 @@ msgstr ""
 "Sebuah argumen --flag tidak memiliki <keyword>:<argnum>:[pass-]<flag> "
 "sintaks: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Karakter bukan-ASCII di %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Komentar bukan-ASCII di atau sebelum %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "String bukan-ASCII di %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: peringatan: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4331,7 +4340,7 @@ msgstr ""
 "Walaupun telah digunakan dalam sebuah posisi format string, %s bukan sebuah "
 "format string %s valid. Karena: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4340,7 +4349,7 @@ msgstr ""
 "Walaupun dideklarasikan seperti itu, %s bukan sebuah format string %s yang "
 "valid. Karena: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4355,7 +4364,7 @@ msgstr ""
 "bernama,\n"
 "dan sebuah pemetaan daripada sebuah tuple untuk argumen.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4365,27 +4374,27 @@ msgstr ""
 "gettext(\"\") mengembalikan masukan header dengan\n"
 "informasi meta, bukan string kosong.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "spesifikasi argumen ambigu untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk argumen plural dari kata kunci '%.*s'"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "konteks tidak cocok diantara bentuk singular dan plural"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4398,7 +4407,7 @@ msgstr ""
 "variabel MSGID_BUGS_ADDRESS disana; jika tidak mohon spesifikasikan\n"
 "sebuah pilihan baris perintah --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
@@ -4509,7 +4518,7 @@ msgstr "%s:%d: interpolasi tidak valid (\"\\L\") dari karakter 8bit \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolasi tidak valid (\"\\U\") dari karakter 8bit \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4518,7 +4527,7 @@ msgstr ""
 "sebuah komentar\n"
 "seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4531,7 +4540,7 @@ msgstr ""
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4544,7 +4553,7 @@ msgstr ""
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4557,7 +4566,7 @@ msgstr ""
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4570,7 +4579,7 @@ msgstr ""
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4582,22 +4591,22 @@ msgstr ""
 "sebuah komentar\n"
 "seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Pengkodean \"%s\" tidak dikenal. Lebih baik melanjutkan dengan ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definisi string tidak valid"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: hilang angka setelah #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ekspresi string tidak valid"
diff --git a/gettext-tools/po/it.gmo b/gettext-tools/po/it.gmo
index eed4658..bdb3298 100644
--- a/gettext-tools/po/it.gmo
+++ b/gettext-tools/po/it.gmo
diff --git a/gettext-tools/po/it.po b/gettext-tools/po/it.po
index ad83725..52d467c 100644
--- a/gettext-tools/po/it.po
+++ b/gettext-tools/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-08-05 15:28+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -110,7 +110,7 @@ msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -188,15 +188,15 @@ msgstr "argomento source_version di compile_java_class non valido"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argomento target_version di compile_java_class non valido"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "creazione di \"%s\" non riuscita"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -222,39 +222,39 @@ msgid "%s subprocess I/O error"
 msgstr "errore di I/O nel sottoprocesso %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esaurita"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "creazione di thread non riuscita"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "scrittura sul sottoprocesso %s non riuscita"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "lettura dal sottoprocesso %s non riuscita"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "impossibile impostare un I/O non bloccante per il sottoprocesso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "comunicazione col sottoprocesso %s non riuscita"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "sottoprocesso %s terminato con codice d'uscita %d"
@@ -293,18 +293,18 @@ msgstr "\""
 msgid "setting permissions for %s"
 msgstr "impostazione permessi per %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "impossibile creare la pipe"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle non riuscito"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "impossibile ripristinare il fd %d: dup2 non riuscito"
@@ -336,11 +336,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Usare \"%s --help\" per maggiori informazioni.\n"
@@ -360,7 +360,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -375,21 +375,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  mostra questo aiuto ed esce\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  mostra questo aiuto ed esce\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               mostra le informazioni sulla versione ed esce\n"
@@ -399,20 +399,20 @@ msgstr "  -V, --version               mostra le informazioni sulla versione ed e
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -427,10 +427,10 @@ msgstr ""
 "NON c'è alcuna garanzia, fino agli estremi permessi dalla legge.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scritto da %s.\n"
@@ -461,18 +461,18 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "errore durante l'apertura di \"%s\" in lettura"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -481,19 +481,19 @@ msgstr ""
 "\"%s\""
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "una specifica di formato per l'argomento %u non esiste in \"%s\""
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -537,8 +537,7 @@ msgstr ""
 "numero %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "il numero di specifiche di formato in \"%s\" e \"%s\" non corrisponde"
@@ -880,8 +879,8 @@ msgstr ""
 "le specifiche di formato in \"%s\" non sono un sottoinsieme di quelle in \"%s"
 "\""
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "una specifica di formato per l'argomento \"%s\" non esiste in \"%s\""
@@ -901,20 +900,20 @@ msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 "Nella direttiva numero %u, \"%c\" non può iniziare il nome di un campo."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "Nella direttiva numero %u, \"%c\" non è seguito da un argomento di getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 "Nella direttiva numero %u, \"%c\" non può iniziare un parametro di gettitem."
 
 # FIXME: nesting?
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -922,12 +921,12 @@ msgstr ""
 "Nella direttiva numero %u, non è ammesso ulteriore nesting nel formato di "
 "specificazione."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "Nella direttiva numero %u, c'è una direttiva di formato non terminata."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -935,14 +934,14 @@ msgstr ""
 "La stringa fa riferimento ad argomenti attraverso specificazioni di "
 "argomenti sia con nome che senza nome."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "La stringa fa riferimento all'argomento chiamato \"%s\" in modi "
 "incompatibili."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -950,7 +949,7 @@ msgstr ""
 "le specifiche di formato in \"%s\" prevedono una mappatura, quelle in \"%s\" "
 "prevedono una tupla"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -958,7 +957,7 @@ msgstr ""
 "le specifiche di formato in \"%s\" prevedono una tupla, quelle in \"%s\" "
 "prevedono una mappatura"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -966,7 +965,7 @@ msgstr ""
 "una specifica di formato per l'argomento \"%s\", come in \"%s\", non esiste "
 "in \"%s\""
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1025,7 +1024,7 @@ msgstr ""
 "Il carattere che termina la direttiva numero %u  non è una cifra tra 1 e 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1073,11 +1072,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            indirizzi per il nome dell'host\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Output informativo:\n"
@@ -1149,12 +1148,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "è permesso al massimo un file di input"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s sono mutuamente esclusive"
@@ -1173,7 +1172,7 @@ msgstr ""
 "Filtra i messaggi di un catalogo di traduzioni in base ai loro attributi,\n"
 "e manipola gli attributi.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1184,10 +1183,10 @@ msgstr ""
 "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle "
 "corte.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Posizione del file di input:\n"
@@ -1197,10 +1196,10 @@ msgstr "Posizione del file di input:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FILEINPUT                   file PO di input\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1216,23 +1215,23 @@ msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Se nessun file di input è indicato o è -, viene letto lo standard input.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Posizione del file di output:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      scrive l'output sul file specificato\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1243,7 +1242,7 @@ msgstr ""
 "I risultati vengono scritti su standard output quando nessun file di output\n"
 "è specificato o è -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selezione dei messaggi:\n"
@@ -1364,9 +1363,9 @@ msgid ""
 msgstr ""
 "      --obsolete              sinonimo di --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1392,17 +1391,17 @@ msgstr ""
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Dettagli di output:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1415,17 +1414,17 @@ msgstr ""
 "                              QUANDO può essere 'always', 'never', 'auto', o "
 "'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=FILESTILE       specifica il file di stile CSS per --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1433,9 +1432,9 @@ msgstr ""
 "  -e, --no-escape             non usa gli escape del C nell'output "
 "(predefinito)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1444,29 +1443,29 @@ msgstr ""
 "carattere\n"
 "                              esteso\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              scrive il file PO anche se vuoto\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                scrive il file .po usando lo stile indentato\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           non scrive le righe \"#: nomefile:riga\"\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1475,40 +1474,40 @@ msgstr ""
 "\" (predefinito)\n"
 "\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                genera un file .po in formato Uniforum strict\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     genera un file Java .properties\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    genera un file NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMERO          imposta la larghezza della pagina\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1518,33 +1517,33 @@ msgstr ""
 "lunghe\n"
 "                              della larghezza della pagina\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera un output ordinato\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          ordina l'output in base alla posizione del "
 "file\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "il criterio di selezione specificato è impossibile (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uso: %s [OPZIONE] [FILEINPUT]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1567,24 +1566,24 @@ msgstr ""
 "meno che sia specificata l'opzione --use-first, nel qual caso vengono usati\n"
 "solo quelli nel primo file PO.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FILEINPUT ...               file di input\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FILE       legge l'elenco dei file di input da FILE\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Se il file di input è -, viene letto lo standard input.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1593,7 +1592,7 @@ msgstr ""
 "  -<, --less-than=NUMERO      stampa i messaggi with con meno di NUMERO\n"
 "                              definizioni, è predefinito a 1\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1603,7 +1602,7 @@ msgstr ""
 "definizioni,\n"
 "                              è predefinito a 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1613,7 +1612,7 @@ msgstr ""
 "messaggi\n"
 "                              unici vengono stampati\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1622,7 +1621,7 @@ msgstr ""
 "  -P, --properties-input      i file di input usano la sintassi Java ."
 "properties\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1633,12 +1632,12 @@ msgstr ""
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOME          codifica dell'output\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1647,7 +1646,7 @@ msgstr ""
 "      --use-first             usa la prima traduzione disponibile per ogni\n"
 "                              messaggio, non unisce diverse traduzioni\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1655,7 +1654,7 @@ msgstr ""
 "      --lang=NOMECATALOGO     imposta il campo 'Language' nell'intestazione\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1762,19 +1761,19 @@ msgstr "questo messaggio è usato ma non è definito in %s"
 msgid "warning: this message is not used"
 msgstr "attenzione: questo messaggio non è usato"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "trovato %d errore fatale"
 msgstr[1] "trovati %d errori fatali"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "devono essere specificati almeno due file"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1794,7 +1793,7 @@ msgstr ""
 "commenti di estrazione saranno conservati, ma solo dal primo file PO che li\n"
 "definisce. Le posizioni nei file di tutti i file PO verranno accumulate.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1804,7 +1803,7 @@ msgstr ""
 "definizioni,\n"
 "                              è predefinito a 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1854,7 +1853,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                stile di output Uniforum strict\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "non è specificato nessun file d'ingresso"
@@ -2043,120 +2042,120 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "il filtro di output non termina con newline"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "l'argomento di %s deve essere un singolo carattere di punteggiatura"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "endianness non valida: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "nessun file di input va indicato se sono specificati %s e %s"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s richiede una specificazione \"-d directory\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s richiede una specificazione \"-l locale\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s richiede una specificazione \"--template template\""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s richiede una specificazione \"-o file\""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s e %s sono mutuamente esclusive in %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s è valido solo con %s o %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s è valido solo con %s, %s o %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "impossibile creare il file di output \"%s\""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d messaggio tradotto"
 msgstr[1] "%d messaggi tradotti"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduzione fuzzy"
 msgstr[1] ", %d traduzioni fuzzy"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d messaggio non tradotto"
 msgstr[1] ", %d messaggi non tradotti"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uso: %s [OPZIONE] nomefile.po ...\n"
 
 # FIXME
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genera un catalogo binario di messaggi dalla descrizione di traduzioni "
 "testuali.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             file di input\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo di operazione:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2165,7 +2164,7 @@ msgstr ""
 "  -j, --java                  modo Java: genera una classe Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2174,12 +2173,12 @@ msgstr ""
 "      --java2                 come --java, e assume Java2 (JDK 1.2 o "
 "superiore)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                modo C#: genera un file .NET .dll\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2188,53 +2187,53 @@ msgstr ""
 "      --csharp-resources      modo risorse C#: genera un file .NET ."
 "resources\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   modo Tcl: genera un file tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    modo Qt: genera un file Qt .qm\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    modo Qt: genera un file Qt .qm\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                abilita il modo Uniforum strict\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Se il file di output è -, l'output viene scritto sullo standard output.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Posizione del file di output in modo Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RISORSA      nome della risorsa\n"
 
 # FIXME
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2242,7 +2241,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOCALE         nome della locale, o lingua o lingua_PAESE\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2252,7 +2251,7 @@ msgstr ""
 "class\n"
 
 # FIXME
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2261,7 +2260,7 @@ msgstr ""
 "delle\n"
 "                              classi\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2273,12 +2272,12 @@ msgstr ""
 "della risorsa, separata da una sottolineatura. L'opzione -d è obbligatoria.\n"
 "La classe viene scritta nella directory specificata.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Posizione del file di output in modo C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2288,7 +2287,7 @@ msgstr ""
 "dalla\n"
 "                              locale\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2297,18 +2296,18 @@ msgstr ""
 "Le opzioni -l e -d sono obbligatorie. Il file .dll viene scritto in una\n"
 "sottodirectory della directory indicata, il cui nome dipende dalla locale.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Posizione del file di output in modo Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                directory base dei cataloghi di messaggi .msg\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2317,22 +2316,22 @@ msgstr ""
 "Le opzioni -l e -d sono obbligatorie. Il file .msg viene scritto nella\n"
 "directory indicata.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=TEMPLATE         un file .desktop usato come template\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORY                directory base dei file .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2341,7 +2340,7 @@ msgstr ""
 "  -kPAROLA, --keyword=PAROLA  cerca PAROLA come parola chiave aggiuntiva\n"
 "  -k, --keyword               non usa le parole chiave predefinite\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2352,27 +2351,27 @@ msgstr ""
 "file\n"
 "di input vengono letti dalla directory invece che dalla riga di comando.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, fuzzy, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=TEMPLATE         un file .desktop usato come template\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretazione del file di input:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2383,14 +2382,14 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          controlla le stringhe di formato dipendenti\n"
 "                              dal linguaggio\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2399,7 +2398,7 @@ msgstr ""
 "      --check-header          verifica l'esistenza e il contenuto\n"
 "                              dell'intestazione\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2409,7 +2408,7 @@ msgstr ""
 "dominio\n"
 "                              e l'opzione --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2418,7 +2417,7 @@ msgstr ""
 "  -C, --check-compatibility   controlla che GNU msgfmt si comporti come\n"
 "                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2428,12 +2427,12 @@ msgstr ""
 "      --check-accelerators[=CAR]  controlla la presenza degli acceleratori\n"
 "                                da tastiera per le voci di menù\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             usa le voci fuzzy nell'output\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2441,7 +2440,7 @@ msgstr ""
 "  -a, --alignment=NUMERO      allinea le stringhe a NUMERO byte\n"
 "                              (predefinito: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2453,94 +2452,94 @@ msgstr ""
 "                              richiesto (big o little, predefinito: dipende\n"
 "                              dall'architettura)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               non include la tabella hash nel file binario\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            stampa statistiche sulle traduzioni\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta il livello di prolissità\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "attenzione: intestazione del file PO mancante o non valida\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "attenzione: la conversione del set di caratteri non riuscirà\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "attenzione: intestazione fuzzy del file PO\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "attenzione: versioni più vecchie di msgfmt generano un errore in questo "
 "caso\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "il nome di dominio \"%s\" non è adatto come nome di file"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "il nome di dominio \"%s\" non è adatto come nome di file: sarà usato\n"
 "un prefisso"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direttiva di dominio \"%s\" ignorata"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" vuota"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" fuzzy"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: attenzione: il file sorgente contiene traduzioni fuzzy"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s non esiste"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s esiste ma non può essere letto"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
@@ -2791,13 +2790,13 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traduzioni italiane per il pacchetto %s."
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "il set di caratteri corrente \"%s\" non è un nome di codifica portabile"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "due diversi set di caratteri \"%s\" e \"%s\" nel file di input"
@@ -2819,7 +2818,7 @@ msgstr ""
 "il dominio \"%s\" nel file di input \"%s\" non contiene un'intestazione con "
 "una specificazione del set di caratteri"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
@@ -2827,7 +2826,7 @@ msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "attenzione: "
@@ -2920,26 +2919,26 @@ msgstr ""
 "L'output di \"%s\" potrebbe essere incorretto.\n"
 "Una possibile soluzione è impostare LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "l'espressione plurale può produrre valori negativi"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ma l'espressione plurale può produrre valori fino a %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "l'espressione plurale può produrre una divisione per zero"
 
 # FIXME
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "l'espressione plurale può produrre un overflow dell'intero"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2947,51 +2946,51 @@ msgstr ""
 "l'espressione plurale può produrre una eccezione aritmetica, forse una "
 "divisione per zero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Provare ad usare il seguente, valido per %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "il catalogo dei messaggi contiene traduzioni di forme plurali"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ma l'intestazione non contiene un attributo \"plural=ESPRESSIONE\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ma l'intestazione non contiene un attributo \"plural=INTERO\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "valore di nplurals non valido"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "espressione plurale non valida"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "ma alcuni messaggi hanno solo una forma plurale"
 msgstr[1] "ma alcuni messaggi hanno solo %lu forme plurali"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "ma alcuni messaggi hanno una forma plurale"
 msgstr[1] "ma alcuni messaggi hanno %lu forme plurali"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -3000,95 +2999,100 @@ msgstr ""
 "l'intestazione non contiene \"Plural-Forms: nplurals=INTERO; "
 "plural=ESPRESSIONE;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "le voci \"msgid\" e \"msgid_plural\" non cominciano entrambe con \"\\n\""
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "le voci \"msgid\" e \"msgstr[%u]\" non cominciano entrambe con \"\\n\""
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "le voci \"msgid\" e \"msgstr\" non cominciano entrambe con \"\\n\""
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "le voci \"msgid\" e \"msgid_plural\" non finiscono entrambe con \"\\n\""
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "le voci \"msgid\" e \"msgstr[%u]\" non finiscono entrambe con \"\\n\""
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "le voci \"msgid\" e \"msgstr\" non finiscono entrambe con \"\\n\""
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "la gestione del plurale è un'estensione di GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "in msgstr manca il carattere \"%c\" per l'acceleratore da tastiera"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "in msgstr ci sono troppi caratteri \"%c\" per l'acceleratore da tastiera"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr ""
 "il campo di intestazione \"%s\" è ancora al valore iniziale predefinito\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "campo \"%s\" mancante nell'intestazione\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "punti di sospensione ASCII ('...') invece che Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "usate virgolette doppie ASCII invece che Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "usate virgolette singole invece che Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, fuzzy, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "punti di sospensione ASCII ('...') invece che Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: input non valido nella codifica \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: errore durante la conversione dalla codifica \"%s\" alla codifica \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "il file di input non contiene un'intestazione con una specificazione del set "
 "di caratteri"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3097,7 +3101,7 @@ msgstr ""
 "Impossibile convertire da \"%s\" a \"%s\". %s si basa su iconv(), e iconv() "
 "non gestisce questa conversione."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3107,8 +3111,8 @@ msgstr ""
 "diventano\n"
 "uguali."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3553,7 +3557,7 @@ msgstr "end-of-line all'interno di una stringa"
 msgid "context separator <EOT> within string"
 msgstr "separatore di contesto <EOT> all'interno di una stringa"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "questo file potrebbe non contenere direttive di dominio"
@@ -3575,32 +3579,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr "attenzione: carattere Unicode non valido"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "nome di filtro mancante"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "valore di nplurals non valido"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "il file \"%s\" è troncato"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "il file \"%s\" contiene una stringa non terminata da NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "il file \"%s\" non è nel formato GNU .mo"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "il file \"%s\" contiene una stringa non terminata da NUL, in %s"
@@ -3783,25 +3787,25 @@ msgstr "compilazione della classe C# non riuscita, provare --verbose"
 msgid "compilation of C# class failed"
 msgstr "compilazione della classe C# non riuscita"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "errore durante l'apertura di \"%s\" in scrittura"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nome di classe Java non valido: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "compilazione della classe Java non riuscita, provare --verbose o impostare "
 "$JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3918,12 +3922,12 @@ msgstr ""
 "formato\n"
 "dei cataloghi Tcl non le gestisce.\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: attenzione: stringa non terminata"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: attenzione: espressione regolare non terminata"
@@ -3943,7 +3947,7 @@ msgstr "%s:%d: attenzione: costante carattere non terminata"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: attenzione: costante stringa non terminata"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Specificare la codifica del sorgente usando --from-code."
 
@@ -3983,7 +3987,7 @@ msgstr ""
 "%s:%d: sequenza multibyte incompleta alla fine della riga.\n"
 "Indicare la corretta codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv non riuscita"
@@ -3997,7 +4001,7 @@ msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: attenzione: carattere Unicode non valido"
@@ -4017,56 +4021,56 @@ msgstr "%s:%d: attenzione: trovata \")\" dove era prevista \"}\""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: attenzione: trovata \"}\" dove era prevista \")\""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "\"%s\" non è un nome di codifica valido. Verrà usato ASCII.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing non può essere usato quando l'output è scritto su standard "
 "output"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext non può operare senza parole chiavi da ricercare"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "attenzione: il file \"%s\" ha estensione \"%s\" sconosciuta: si prova con C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Estrae le stringhe traducibili dai file di input indicati.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4075,12 +4079,12 @@ msgstr ""
 "  -d, --default-domain=NOME   usa NOME.po per l'output (invece di messages."
 "po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           scrive l'output sul file indicato\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4088,12 +4092,12 @@ msgstr ""
 "  -p, --output-dir=DIR        i file di output saranno posizionati nella\n"
 "                              directory DIR\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Scelta del linguaggio del file di input:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4114,12 +4118,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abbreviazione di --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4128,7 +4132,7 @@ msgstr ""
 "Come impostazione predefinita, la scelta del linguaggio si basa "
 "sull'estensione del file di input.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4137,23 +4141,23 @@ msgstr ""
 "      --from-code=NOME        codifica dei file di input\n"
 "                                (ad eccezione di Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Come impostazione predefinita, i file di input si considerano ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         unisce i messaggi con il file esistente\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  non estrae le voci in FILE.po\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4171,15 +4175,15 @@ msgstr ""
 "                                le righe di parole chiave nel file di "
 "output\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4187,17 +4191,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opzioni di linguaggio specifiche:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           estrae tutte le stringhe\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4212,7 +4216,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4227,7 +4231,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4238,7 +4242,7 @@ msgstr ""
 "nell'argomento\n"
 "                              numero ARG della parola chiave PAROLA\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4253,37 +4257,48 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             riconosce i trigrammi ANSI C in input\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (solo linguaggi C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=FILE       legge l'elenco dei file di input da FILE\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (solo linguaggio C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    riconosce le stringhe di formato Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (solo linguaggio C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   riconosce le stringhe di formato KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 riconosce le stringhe di formato Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4292,23 +4307,17 @@ msgstr ""
 "del\n"
 "                              riconoscimento della stringa di formato\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     scrive un file .properties Java\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=FILE       legge l'elenco dei file di input da FILE\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --indent                stile di output indentato\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
@@ -4316,7 +4325,7 @@ msgstr ""
 "output\n"
 
 # FIXME UPSTREAM
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4324,20 +4333,20 @@ msgstr ""
 "      --foreign-user          omette dall'output il copyright della FSF per\n"
 "                              gli utenti non GNU\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 "      --package-name=NOME     imposta il nome del pacchetto in output\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSIONE imposta la versione del pacchetto in "
 "output\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4346,7 +4355,7 @@ msgstr ""
 "segnalare\n"
 "                              errori nelle voci msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4357,7 +4366,7 @@ msgstr ""
 "nelle\n"
 "                                voci msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4369,7 +4378,7 @@ msgstr ""
 "                                voci msgstr\n"
 
 # FIXME UPSTREAM
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4378,31 +4387,31 @@ msgstr ""
 "Un argomento di --flag non usa la sintassi <parolachiave>:<num-arg>:[pass-]"
 "[flag]: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Carattere non ASCII in %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Commento non ASCII in o prima di %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Stringa non ASCII in %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: attenzione: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4411,7 +4420,7 @@ msgstr ""
 "Sebbene usata dove dovrebbe esserci una stringa di formato, %s non è una "
 "stringa di formato %s valida. Motivo: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4421,7 +4430,7 @@ msgstr ""
 "Motivo: %s\n"
 
 # FIXME
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4435,7 +4444,7 @@ msgstr ""
 "Considerare l'uso di una stringa di formato con argomenti con nome,\n"
 "e di una mappatura invece di una tupla per gli argomenti.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4445,29 +4454,29 @@ msgstr ""
 "gettext(\"\") restituisce l'intestazione con\n"
 "le metainformazioni, non la stringa vuota.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "specificazione di argomento ambigua per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "attenzione: contesto mancante per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "attenzione: contesto mancante per l'argomento plurale della parola chiave "
 "\"%.*s\""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "differenza di contesto tra la forma singolare e la forma plurale"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4479,7 +4488,7 @@ msgstr ""
 "variabile MSGID_BUGS_ADDRESS; altrimenti specificare \n"
 "l'opzione --msgid-bugs-address da riga di comando.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "linguaggio \"%s\" sconosciuto"
@@ -4590,7 +4599,7 @@ msgstr "%s:%d: interpolazione non valida (\"\\L\") del carattere a 8bit \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazione non valida (\"\\U\") del carattere a 8bit \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4598,7 +4607,7 @@ msgstr ""
 "Indicare la codifica del sorgente usando --from-code o con un commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4610,7 +4619,7 @@ msgstr ""
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4622,7 +4631,7 @@ msgstr ""
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4634,7 +4643,7 @@ msgstr ""
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4646,7 +4655,7 @@ msgstr ""
 "commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4657,22 +4666,22 @@ msgstr ""
 "Indicare la codifica del sorgente usando --from-code o con un commento\n"
 "come specificato in http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Codifica \"%s\" sconosciuta. Si continua con ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definizione stringa non valida"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: numero mancante dopo #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: espressione stringa non valida"
diff --git a/gettext-tools/po/ja.gmo b/gettext-tools/po/ja.gmo
index c2e9950..d835120 100644
--- a/gettext-tools/po/ja.gmo
+++ b/gettext-tools/po/ja.gmo
diff --git a/gettext-tools/po/ja.po b/gettext-tools/po/ja.po
index a8335ef..1b6a09d 100644
--- a/gettext-tools/po/ja.po
+++ b/gettext-tools/po/ja.po
@@ -1,14 +1,14 @@
 # Translation of `gettext-tools' messages to Japanese.
-# Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2015.
+# Masahito Yamaga <ma@yama-ga.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19.7-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-23 19:15+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-01 19:35+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
@@ -108,7 +108,7 @@ msgid "Unknown system error"
 msgstr "̤ÃΤΥ·¥¹¥Æ¥à¥¨¥é¡¼"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -186,15 +186,15 @@ msgstr "compile_java_class ¤ËÂФ¹¤ë̵¸ú¤Ê source_version °ú¿ô"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class ¤ËÂФ¹¤ë̵¸ú¤Ê target_version °ú¿ô"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" ¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -221,39 +221,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹Æþ½ÐÎÏ¥¨¥é¡¼"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "¥¹¥ì¥Ã¥É¤ÎÀ¸À®¤Ë¼ºÇÔ"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s ¤Ø½ñ¤­½Ð¤¹¥µ¥Ö¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤Ë¥Ö¥í¥Ã¥­¥ó¥°¤·¤Ê¤¤Æþ½ÐÎϤòÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤È¤ÎÄÌ¿®¤Ë¼ºÇÔ"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s ¥µ¥Ö¥×¥í¥»¥¹¤¬½ªÎ»¥³¡¼¥É %d ¤Ç½ªÎ»"
@@ -292,18 +292,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr "%s ¤ËÂФ¹¤ë¥¢¥¯¥»¥¹¸¢¤òÀßÄê"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "¥Ñ¥¤¥×¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle ¼ºÇÔ"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "fd %d ¤òÉü¸µ¤Ç¤­¤Þ¤»¤ó: dup2 ¼ºÇÔ"
@@ -335,11 +335,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "Í×ÁÇ <%s> ¤Ï°À­ <%s> ¤ò»ý¤Á¤Þ¤»¤ó"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "¤è¤ê¿¤¯¤Î¾ðÊó¤òÆÀ¤ë¤¿¤á¤Ë¤Ï '%s --help' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤.\n"
@@ -364,7 +364,7 @@ msgstr ""
 "CLDR Ê£¿ô·Á¥ë¡¼¥ë¤òÆɤ߹þ¤ß, gettext ¤¬»È¤¨¤ë¤è¤¦¤Ê·Á¤Çɽ¼¨¤·¤Þ¤¹.\n"
 "°ú¿ô¤¬¤Ê¤¤¾ì¹ç, ɸ½àÆþÎϤ«¤é CLDR Ê£¿ô·Á¥ë¡¼¥ë¤òÆɤ߹þ¤ß¤Þ¤¹.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -379,21 +379,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  CLDR ·Á¼°¤ÇÊ£¿ô·Á¥ë¡¼¥ë¤òɽ¼¨\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Æ½ªÎ»\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n"
@@ -403,20 +403,20 @@ msgstr "  -V, --version               ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï <bug-gnu-gettext@gnu.org> ¤Þ¤Ç.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -434,10 +434,10 @@ msgstr ""
 "¤¿¤À¤·Ë¡Î§¤¬µö¤¹ÈϰϤÇ̵ÊݾڤǤ¹.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ºî¼Ô %s.\n"
@@ -468,37 +468,37 @@ msgid "extra operand %s"
 msgstr ";ʬ¤Ê¥ª¥Ú¥é¥ó¥É %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" ¤òÆɤ߹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "°ú¿ô %u ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Î¤è¤¦¤Ë '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "°ú¿ô %u ¤ËÂФ¹¤ë·Á¼°¤Î»ØÄ꤬ '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -534,8 +534,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "ʸ»úÎó¤Ï°ú¿ôÈÖ¹æ %u ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¤¬°ú¿ôÈÖ¹æ %u ¤ò̵»ë¤·¤Æ¤¤¤Þ¤¹."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "'%s' ¤È '%s' ¤Ç»ØÄꤷ¤¿·Á¼°¤Î¿ô¤¬¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
@@ -835,8 +834,8 @@ msgstr "'%s' ¤È '%s' ¤Ç¤Î·Á¼°¤Î»ØÄ꤬Åù¤·¤¯¤¢¤ê¤Þ¤»¤ó"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "'%s' ¤Ç¤Î·Á¼°¤Î»ØÄ꤬ '%s' ¤Ç¤Î¥µ¥Ö¥»¥Ã¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "°ú¿ô '%s' ¤ËÂФ¹¤ë·Á¼°»ØÄ꤬ '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó"
@@ -853,58 +852,58 @@ msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ¥µ¥¤¥º»ØÄê¤ÏÊÑ´¹»ØÄê '%c' ¤È¸ß´¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '%c' ¤Ç¥Õ¥£¡¼¥ë¥É̾¤ò¤Ï¤¸¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '%c' ¤Ç getattr ¤Î°ú¿ô¤ò¤Ï¤¸¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, '%c' ¤Ç getitem ¤Î°ú¿ô¤ò¤Ï¤¸¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç¤Ï, ¥Õ¥©¡¼¥Þ¥Ã¥È¼±Ê̻ҤǤ³¤ì°Ê¾å¤Î¥Í¥¹¥È¤Ï¤Ç¤­¤Þ¤»¤ó."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Ç, ½ªÃ¼Ê¸»ú¤Î¤Ê¤¤¥Õ¥©¡¼¥Þ¥Ã¥ÈÌ¿Î᤬¤¢¤ê¤Þ¤¹."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 "ʸ»úÎó¤Ï, ̾Á°¤Î¤¢¤ë°ú¿ô¤â, ̾Á°¤Ê¤·¤Î°ú¿ô¤â, ¤É¤Á¤é¤Î°ú¿ô¤â»²¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "ʸ»úÎó¤ÏÈó¸ß´¹¤ÊÊýË¡¤Ç°ú¿ô̾ '%s' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "'%s' ¤Ç¤Î·Á¼°»ØÄê¤Ï¥Þ¥Ã¥Ô¥ó¥°¤Ç¤¹¤¬, '%s' ¤Ç¤Ï¥¿¥×¥ë (tuple) ¤Ç¤¹"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "'%s' ¤Ç¤Î·Á¼°»ØÄê¤Ï¥¿¥×¥ë (tuple) ¤Ç¤¹¤¬, '%s' ¤Ç¤Ï¥Þ¥Ã¥Ô¥ó¥°¤Ç¤¹"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "°ú¿ô '%s' ¤ËÂФ¹¤ë·Á¼°»ØÄ꤬ '%s' ¤Î¤è¤¦¤Ë '%s' ¤Ë¸ºß¤·¤Þ¤»¤ó"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -957,7 +956,7 @@ msgid ""
 msgstr "Ì¿ÎáÈÖ¹æ %u ¤Î½ªÃ¼Ê¸»ú¤Ï 1 ¤«¤é 9 ¤Î´Ö¤Î¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1005,11 +1004,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ¥Û¥¹¥È̾¤ËÂФ¹¤ë¥¢¥É¥ì¥¹\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "¾ðÊó½ÐÎÏ:\n"
@@ -1081,12 +1080,12 @@ msgstr "¤½¤Î¥ë¡¼¥ÈÍ×ÁÇ¤Ï \"locatingRules\" ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 msgid "at most one input file allowed"
 msgstr "ºÇÂç 1¤Ä¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬µö¤µ¤ì¤Þ¤¹"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ¤È %s ¤ÏÇØÈ¿¤Ç¤¹"
@@ -1103,7 +1102,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr "°À­¤Ë½¾¤Ã¤ÆËÝÌõ¥«¥¿¥í¥°¤Î¥á¥Ã¥»¡¼¥¸¤òÁªÊ̤·, °À­¤ò¤¦¤Þ¤¯Áàºî¤·¤Þ¤¹.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1112,10 +1111,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Ť¤¥ª¥×¥·¥ç¥ó¤Ëɬ¿Ü¤Î°ú¿ô¤Ïû¤¤¥ª¥×¥·¥ç¥ó¤Ë¤âɬ¿Ü¤Ç¤¹.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î»ØÄê:\n"
@@ -1125,10 +1124,10 @@ msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î»ØÄê:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   ÆþÎÏ PO ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1142,23 +1141,23 @@ msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î»ØÄê:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      »ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1169,7 +1168,7 @@ msgstr ""
 "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Ê¤¤, ¤â¤·¤¯¤Ï - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ"
 "¤¹.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "¥á¥Ã¥»¡¼¥¸ÁªÂò:\n"
@@ -1282,9 +1281,9 @@ msgid ""
 msgstr ""
 "      --obsolete              --only-obsolete --clear-obsolete ¤ÈƱ¤¸\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1307,17 +1306,17 @@ msgstr ""
 "      --stringtable-input     ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï NeXTstep/GNUstep .strings ¤Îʸ"
 "Ë¡\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "½ÐÎϤξܺÙ:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1330,26 +1329,26 @@ msgstr ""
 "                              WHEN ¤Ï 'always', 'never', 'auto', ¤Þ¤¿¤Ï "
 "'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=STYLEFILE       --color ¤ËÂФ¹¤ë CSS ¥¹¥¿¥¤¥ë¥ë¡¼¥ë¤ò»ØÄê\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             ½ÐÎÏ¤Ë C ¸À¸ì¤Î¥¨¥¹¥±¡¼¥×¤ò»È¤ï¤Ê¤¤ (ɸ½à)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1357,68 +1356,68 @@ msgstr ""
 "  -E, --escape                ½ÐÎÏ¤Ë C ¸À¸ì¤Î¥¨¥¹¥±¡¼¥×¤ò»È¤¤,\n"
 "                              ³Èĥʸ»ú¤ò´Þ¤á¤Ê¤¤\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              ¶õ¤Ç¤¢¤Ã¤Æ¤â PO ¥Õ¥¡¥¤¥ë¤ò½ñ¤­½Ð¤¹\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                »ú²¼¤²·Á¼°¤Ç .po ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: ¥Õ¥¡¥¤¥ë̾:¹ÔÈÖ¹æ' ¤Î¹Ô¤ò½ñ¤­½Ð¤µ¤Ê¤¤\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          '#: ¥Õ¥¡¥¤¥ë̾:¹ÔÈÖ¹æ' ¤Î¹Ô¤òÀ¸À® (ɸ½à)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                ¸·Ì©¤Ê Uniforum ·Á¼°¤Î .po ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     Java .properties ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    NeXTstep/GNUstep .strings ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          ½ÐÎÏ¥Ú¡¼¥¸¤ÎÉý¤òÀßÄê\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1427,31 +1426,31 @@ msgstr ""
 "      --no-wrap               ½ÐÎÏ¥Ú¡¼¥¸¤ÎÉý¤è¤êŤ¤¥á¥Ã¥»¡¼¥¸¹Ô¤ò²þ¹Ô¤·¤Ê"
 "¤¤\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ¥½¡¼¥È¤µ¤ì¤¿½ÐÎϤòÀ¸À®\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          ¥Õ¥¡¥¤¥ë¤Ç½ÐÎϤò¥½¡¼¥È\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "»ØÄꤵ¤ì¤¿ÁªÂò´ð½à (%d < n < %d) ¤ÏÉÔ²Äǽ¤Ç¤¹"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] [ÆþÎÏ¥Õ¥¡¥¤¥ë]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1473,23 +1472,23 @@ msgstr ""
 "¥³¥á¥ó¥È, ¥Õ¥¡¥¤¥ë¤Î°ÌÃ֤Ϥ½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹. ¤¿¤À¤· --use-first ¤¬»ØÄꤵ¤ì¤¿\n"
 "¾ì¹ç¤Ë¤Ï, ¤½¤ì¤é¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤¬¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               ÆþÎÏ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤ò FILE ¤«¤é¼èÆÀ\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½àÆþÎϤ¬Æɤ߹þ¤Þ¤ì¤Þ¤¹.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1498,7 +1497,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      NUMBER ¤è¤ê¾¯¤Ê¤¤²ó¿ô¤À¤±ÄêµÁ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸\n"
 "                              ¤ò½ÐÎÏ. ÀßÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ïɸ½à¤Ç̵¸Â¸Ä\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1507,7 +1506,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      NUMBER ¤è¤ê¿¤¯ÄêµÁ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò½ÐÎÏ\n"
 "                              ÀßÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ïɸ½à¤Ç 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1516,14 +1515,14 @@ msgstr ""
 "  -u, --unique                --less-than=2 ¤Îû½Ì·Á. 1¤Ä¤·¤«¤Ê¤¤¥á¥Ã¥»¡¼¥¸\n"
 "                              ¤Î¤ß¤òɽ¼¨\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï Java .properties ¤Îʸˡ\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1533,12 +1532,12 @@ msgstr ""
 "      --stringtable-input     ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï NeXTstep/GNUstep .strings ¤Îʸ"
 "Ë¡\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          ½ÐÎϤΥ¨¥ó¥³¡¼¥Ç¥£¥ó¥°\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1547,14 +1546,14 @@ msgstr ""
 "      --use-first             ³Æ¡¹¤Î¥á¥Ã¥»¡¼¥¸¤ÎºÇ½é¤ËÍ­¸ú¤ÊËÝÌõ¤ò»È¤¦\n"
 "                              Ê£¿ô¤ÎËÝÌõ¤ò¥Þ¡¼¥¸¤·¤Ê¤¤\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=CATALOGNAME      ¥Ø¥Ã¥À¹àÌܤΠ'Language' Íó¤ò»ØÄê\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1659,18 +1658,18 @@ msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤¹¤¬ %s ¤Ç¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 msgid "warning: this message is not used"
 msgstr "·Ù¹ð: ¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï»È¤ï¤ì¤Þ¤»¤ó"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d ¸Ä¤ÎÃ×̿Ū¥¨¥é¡¼¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "¾¯¤Ê¤¯¤È¤â 2¤Ä¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1690,7 +1689,7 @@ msgstr ""
 "¥³¥á¥ó¥È¤Ï, ¤½¤ì¤é¤¬ÄêµÁ¤µ¤ì¤¿ºÇ½é¤Î PO ¥Õ¥¡¥¤¥ë¤Î¤â¤Î¤Î¤ß¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n"
 "¤Þ¤¿¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤ÏÁ´¤Æ¤Î PO ¥Õ¥¡¥¤¥ë¤«¤é¤½¤Î¤Þ¤Þ»Ä¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1699,7 +1698,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      NUMBER ¤è¤ê¿¤¯ÄêµÁ¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò½ÐÎÏ\n"
 "                              ÀßÄꤵ¤ì¤Ê¤¤¾ì¹ç¤Ïɸ½à¤Ç 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1745,7 +1744,7 @@ msgstr "  -n, --add-location          '#: filename:line' ¤Î¹Ô¤òÊÝ»ý (ɸ½à)\n"
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                ¸·Ì©¤Ê Uniforum ½ÐÎÏ·Á¼°\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
@@ -1924,114 +1923,114 @@ msgstr "      --keep-header           ¥Ø¥Ã¥À¤Î¥¨¥ó¥È¥ê¤ò½¤Àµ¤»¤º¤ËÊÝ»ý\n"
 msgid "filter output is not terminated with a newline"
 msgstr "¥Õ¥£¥ë¥¿¤Î½ÐÎϤϲþ¹Ô¤Ç½ªÃ¼¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s ¤Ø¤Î°ú¿ô¤Ïñ°ì¤Î¶èÀÚ¤êʸ»ú¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "̵¸ú¤Ê¥¨¥ó¥Ç¥£¥¢¥ó: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "%s ¤È %s ¤ò»ØÄꤹ¤ë¾ì¹ç¤ÏÆþÎÏ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¤¤¤Ï¤¤¤±¤Þ¤»¤ó"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s ¤Ë¤Ï \"-d ¥Ç¥£¥ì¥¯¥È¥ê\" ¤Î»ØÄ꤬ɬÍפǤ¹"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s ¤Ë¤Ï \"-l ¥í¥«¡¼¥ë\" ¤Î»ØÄ꤬ɬÍפǤ¹"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s ¤Ë¤Ï \"--template ¥Æ¥ó¥×¥ì¡¼¥È\" ¤Î»ØÄ꤬ɬÍפǤ¹"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s ¤Ë¤Ï \"-o ¥Õ¥¡¥¤¥ë\" ¤Î»ØÄ꤬ɬÍפǤ¹"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s ¤È %s ¤Ï %s ¤Ë¤ª¤¤¤ÆÇØÈ¿¤Ç¤¹"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s ¤Ï %s ¤Þ¤¿¤Ï %s ¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤Ç¤¹"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s ¤Ï %s, %s ¤Þ¤¿¤Ï %s ¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤Ç¤¹"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "%s ¤ËÂФ¹¤ë ITS ¥ë¡¼¥ë¤Î¾ì½ê¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ¸Ä¤ÎËÝÌõ¥á¥Ã¥»¡¼¥¸"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ¸Ä¤Î¤¢¤¤¤Þ¤¤¤ÊËÝÌõ"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d ¸Ä¤Î̤Ìõ¤Î¥á¥Ã¥»¡¼¥¸"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó] filename.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "¥Ð¥¤¥Ê¥ê¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ò¸¶Ê¸¤ÎËÝÌõ¤Îµ­½Ò¤«¤éÀ¸À®.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ÆþÎÏ¥Õ¥¡¥¤¥ë\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Áàºî¥â¡¼¥É:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2039,7 +2038,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java ¥â¡¼¥É: Java ResourceBundle ¥¯¥é¥¹¤ÎÀ¸À®\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2047,12 +2046,12 @@ msgid ""
 msgstr ""
 "      --java2                 --java ¤ÈƱ¤¸¤Ç Java2 (JDK 1.2 °Ê¹ß) ¤ò²¾Äê\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# ¥â¡¼¥É: .NET .dll ¥Õ¥¡¥¤¥ë¤ÎÀ¸À®\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2061,52 +2060,52 @@ msgstr ""
 "      --csharp-resources      C# resources ¥â¡¼¥É: .NET .resources ¥Õ¥¡¥¤¥ë¤Î"
 "À¸À®\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl ¥â¡¼¥É: tcl/msgcat .msg ¥Õ¥¡¥¤¥ë¤ÎÀ¸À®\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt ¥â¡¼¥É: Qt .qm ¥Õ¥¡¥¤¥ë¤ÎÀ¸À®\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 "      --desktop               Desktop Entry ¥â¡¼¥É: .desktop ¥Õ¥¡¥¤¥ë¤ÎÀ¸À®\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   XML ¥â¡¼¥É: XML ¥Õ¥¡¥¤¥ë¤ÎÀ¸À®\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ¸·Ì©¤Ê Uniforum ¥â¡¼¥É¤òÍ­¸ú¤Ë\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤¬ - ¤Î¾ì¹ç¤Ïɸ½à½ÐÎϤ˷ë²Ì¤¬½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java ¥â¡¼¥É¤Ë¤ª¤±¤ë½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     ¥ê¥½¡¼¥¹Ì¾\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2114,7 +2113,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOCALE          ¥í¥«¡¼¥ë̾. ¸À¸ì̾¤â¤·¤¯¤Ï \"¸À¸ì̾_¹ñ̾\"\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2123,14 +2122,14 @@ msgstr ""
 "      --source                .class ¥Õ¥¡¥¤¥ë¤ÎÂå¤ï¤ê¤Ë .java ¥Õ¥¡¥¤¥ë¤òºî"
 "À®\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORY                ¥¯¥é¥¹¥Ç¥£¥ì¥¯¥È¥ê¤Î³¬ÁؤδðËܥǥ£¥ì¥¯¥È¥ê\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2144,12 +2143,12 @@ msgstr ""
 "¤Ë\n"
 "½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# ¥â¡¼¥É¤Ë¤ª¤±¤ë½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2158,7 +2157,7 @@ msgstr ""
 "  -d DIRECTORY                ¥í¥«¡¼¥ë°Í¸¤Î .dll ¥Õ¥¡¥¤¥ë¤Î´ðËܥǥ£¥ì¥¯¥È"
 "¥ê\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2167,18 +2166,18 @@ msgstr ""
 "-l ¤È -d ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü¤Ç¤¹. .dll ¥Õ¥¡¥¤¥ë¤Ï¥í¥«¡¼¥ë¤Ë°Í¸¤·¤¿Ì¾Á°¤ò»ý¤Ä\n"
 "»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë½ñ¤­½Ð¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl ¥â¡¼¥É¤Ë¤ª¤±¤ë½ÐÎÏ¥Õ¥¡¥¤¥ë¤Î¾ì½ê:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                .msg ¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Î´ðËܥǥ£¥ì¥¯¥È¥ê\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2187,22 +2186,22 @@ msgstr ""
 "-l ¤È -d ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü¤Ç¤¹. .msg ¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë½ñ¤­\n"
 "½Ð¤µ¤ì¤Þ¤¹.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Desktop Entry ¥â¡¼¥É¤Î¥ª¥×¥·¥ç¥ó:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=TEMPLATE         .desktop ¥Õ¥¡¥¤¥ë¤ò¥Æ¥ó¥×¥ì¡¼¥È¤Ë»ÈÍÑ\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORY                .po ¥Õ¥¡¥¤¥ë¤Î´ðËܥǥ£¥ì¥¯¥È¥ê\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2211,7 +2210,7 @@ msgstr ""
 "  -kWORD, --keyword=WORD      Äɲå­¡¼¥ï¡¼¥É¤È¤·¤Æ WORD ¤ò¸¡º÷\n"
 "  -k, --keyword               ɸ½à¤Î¥­¡¼¥ï¡¼¥É¤Ï»È¤ï¤Ê¤¤\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2221,27 +2220,27 @@ msgstr ""
 "-l, -o, ¤ª¤è¤Ó --template ¥ª¥×¥·¥ç¥ó¤Ïɬ¿Ü¤Ç¤¹. -D ¤¬»ØÄꤵ¤ì¤¿¾ì¹ç, ÆþÎÏ\n"
 "¥Õ¥¡¥¤¥ë¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤ÎÂå¤ï¤ê¤Ë¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤éÆɤ߹þ¤Þ¤ì¤Þ¤¹.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "XML ¥â¡¼¥É¤Î¥ª¥×¥·¥ç¥ó:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NAME         »ØÄꤵ¤ì¤¿ XML ¸À¸ì¤òǧ¼±\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=TEMPLATE         XML ¥Õ¥¡¥¤¥ë¤ò¥Æ¥ó¥×¥ì¡¼¥È¤Ë»ÈÍÑ\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î²ò¼á:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2252,20 +2251,20 @@ msgstr ""
 "domain\n"
 "                              ¤Ç»ØÄꤵ¤ì¤ëÁ´¤Æ¤Î¥Á¥§¥Ã¥¯¤ò¹Ô¤Ê¤¦\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          ¸À¸ì¤Ë°Í¸¤·¤¿¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ò¥Á¥§¥Ã¥¯\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          ¥Ø¥Ã¥À¹àÌܤθºß¤ÈÆâÍƤò³Îǧ\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2274,7 +2273,7 @@ msgstr ""
 "      --check-domain          ¥É¥á¥¤¥óÌ¿Îá¤È --output-file ¥ª¥×¥·¥ç¥ó¤Î´Ö¤Ë\n"
 "                              Ì·½â¤¬¤Ê¤¤¤«¥Á¥§¥Ã¥¯\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2282,7 +2281,7 @@ msgid ""
 msgstr ""
 "  -C, --check-compatibility   GNU msgfmt ¤Î X/Open msgfmt ¤È¤Î¸ß´¹À­¤ò³Îǧ\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2291,19 +2290,19 @@ msgid ""
 msgstr ""
 "      --check-accelerators[=ʸ»ú]  ¥á¥Ë¥å¡¼¹àÌܤؤΥ­¡¼³ä¤êÅö¤Æ¤ò¥Á¥§¥Ã¥¯\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             fuzzy (¤¢¤¤¤Þ¤¤) ¹àÌܤò½ÐÎϤ˻Ȥ¦\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NUMBER      ʸ»úÎó¤ò NUMBER ¥Ð¥¤¥È¤Ë·¤¨¤ë (ɸ½à: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2316,91 +2315,91 @@ msgstr ""
 "                                (ɸ½à¤Ï¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤è¤ê big ¤« "
 "little)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               ¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤Ï¥Ï¥Ã¥·¥å¥Æ¡¼¥Ö¥ë¤ò´Þ¤Þ¤Ê¤¤\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            ËÝÌõ¤Ë´Ø¤¹¤ëÅý·×¾ðÊó¤òɽ¼¨\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               ¿ÇÃÇ¥ì¥Ù¥ë¤ò¾å¤²¤ë\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "·Ù¹ð: PO ¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¤¬¤Ê¤¤, ¤â¤·¤¯¤ÏÉÔÀµ¤Ç¤¹\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "·Ù¹ð: ʸ»ú¥»¥Ã¥È¤ÎÊÑ´¹¤¬µ¡Ç½¤·¤Þ¤»¤ó\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "·Ù¹ð: PO ¥Õ¥¡¥¤¥ë¥Ø¥Ã¥À¤¬¤¢¤¤¤Þ¤¤¤Ç¤¹\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "·Ù¹ð: msgfmt ¤Î°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¤³¤³¤Ç¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "¥É¥á¥¤¥ó̾ \"%s\" ¤Ï¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆŬÀڤǤϤ¢¤ê¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "¥É¥á¥¤¥ó̾ \"%s\" ¤Ï¥Õ¥¡¥¤¥ë̾¤È¤·¤ÆŬÀڤǤϤ¢¤ê¤Þ¤»¤ó. ÀÜƬ¼­¤ò»È¤¤¤Þ¤¹"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "'¥É¥á¥¤¥ó %s' Ì¿Îá¤Ï̵»ë¤µ¤ì¤Þ¤¹"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "¶õ¤Î 'msgstr' ¥¨¥ó¥È¥ê¤Ï̵»ë¤µ¤ì¤Þ¤¹"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "¤¢¤¤¤Þ¤¤ (fuzzy) ¤Ê 'msgstr' ¥¨¥ó¥È¥ê¤Ï̵»ë¤µ¤ì¤Þ¤¹"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ·Ù¹ð: ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë¤¢¤¤¤Þ¤¤ (fuzzy) ¤ÊËÝÌõ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s ¤Ï¸ºß¤·¤Þ¤»¤ó"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s ¤Ï¸ºß¤·¤Þ¤¹¤¬Æɤ߹þ¤á¤Þ¤»¤ó"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ¤òÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
@@ -2639,12 +2638,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s ¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ¹¤ë±ÑÌõ"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "¸½ºß¤Îʸ»ú¥»¥Ã¥È \"%s\" ¤Ï²ÄÈÂÀ­¤Î¤¢¤ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "2¤Ä¤Î°Û¤Ê¤Ã¤¿Ê¸»ú¥»¥Ã¥È \"%s\" ¤È \"%s\" ¤¬ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë¤¢¤ê¤Þ¤¹"
@@ -2664,7 +2663,7 @@ msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë '%2$s' Æâ¤Î¥É¥á¥¤¥ó \"%1$s\" ¤Ë¤Ïʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌÜ"
 "¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
@@ -2672,7 +2671,7 @@ msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "·Ù¹ð: "
@@ -2768,73 +2767,73 @@ msgstr ""
 "'%s' ¤Î½ÐÎϤÏÉÔÀµ³Î¤Ç¤¢¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹.\n"
 "²Äǽ¤Ê²óÈòºö¤È¤·¤Æ¤Ï LC_ALL=C ¤ÈÀßÄꤷ¤Þ¤¹.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "Ê£¿ôɽ¸½¤¬Éé¤ÎÃͤòÀ¸À®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu ¤Ç¤¹¤¬Ê£¿ôɽ¸½¤¬ %lu ¤ÈƱ¤¸ÄøÅÙ¤ÎÃͤòÀ¸À®¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "Ê£¿ôɽ¸½¤¬¥¼¥í³ä¤ê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "Ê£¿ôɽ¸½¤¬À°¿ô¤¢¤Õ¤ì¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "Ê£¿ôɽ¸½¤¬±é»»Îã³°, ¤ª¤½¤é¤¯¥¼¥í³ä¤ê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "%s ¤Ë¤È¤Ã¤ÆÍ­¸ú¤Ê, ¼¡¤ò»È¤Ã¤Æ¤ß¤Æ¤¯¤À¤µ¤¤:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤ËÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "¤·¤«¤·¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤Ë \"plural=EXPRESSION\" °À­¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "¤·¤«¤·¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤Ë \"nplurals=INTEGER\" °À­¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ÉÔÀµ¤Ê nplurals ¤ÎÃÍ"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ÉÔÀµ¤ÊÊ£¿ô (plural) ɽ¸½"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï %lu ¸Ä¤À¤±Ê£¿ô·Á¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "¤·¤«¤·¤¤¤¯¤Ä¤«¤Î¥á¥Ã¥»¡¼¥¸¤Ë¤Ï %lu ¸Ä¤ÎÊ£¿ô·Á¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2842,93 +2841,98 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤ÏÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹. ¤·¤«¤· \"Plural-Forms: "
 "nplurals=INTEGER; plural=EXPRESSION;\" ¤È¤¤¤¦¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "'msgid' ¤È 'msgid_plural' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "'msgid' ¤È 'msgstr[%u]' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "'msgid' ¤È 'msgstr' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "'msgid' ¤È 'msgid_plural' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "'msgid' ¤È 'msgstr[%u]' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "'msgid' ¤È 'msgstr' ¤Î¥¨¥ó¥È¥ê¤¬¤É¤Á¤é¤â '\\n' ¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "Ê£¿ô·Á¤ÎÀ©¸æ¤Ï GNU gettext ¤Î³ÈÄ¥¤Ç¤¹"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr ¤Ë¤Ï¥­¡¼¥Ü¡¼¥É¥¢¥¯¥»¥ì¥ì¡¼¥¿¤Îµ­¹æ '%c' ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "msgstr ¤Ë¤Ï¤¢¤Þ¤ê¤Ë¿¤¯¤Î¥­¡¼¥Ü¡¼¥É¥¢¥¯¥»¥ì¥ì¡¼¥¿¤Îµ­¹æ '%c' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "¥Ø¥Ã¥À¾ðÊó '%s' ¤¬½é´üɸ½àÃͤΤޤޤǤ¹\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "¥Ø¥Ã¥À¾ðÊó '%s' ¤¬¥Ø¥Ã¥À¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "Unicode ¤ÎÂå¤ï¤ê¤Ë ASCII ¤Î¾Êάµ­¹æ ('...')"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "¥æ¡¼¥¶¤¬¸«¤¨¤ëʸ»úÎó¤Ë¾Êάµ­¹æ¤¬¸«¤Ä¤«¤ëÁ°¤Ë¥¹¥Ú¡¼¥¹"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Unicode ¤ÎÂå¤ï¤ê¤Ë ASCII ¤ÎÆó½Å°úÍÑÉä¤ò»ÈÍÑ"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
-msgstr "Unicode ¤ÎÂå¤ï¤ê¤Ë ASCII ¤Îñ°ì°úÍÑÉä"
+msgstr "Unicode ¤ÎÂå¤ï¤ê¤Ë ASCII ¤Îñ°ì°úÍÑÉä¤ò»ÈÍÑ"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "Unicode ¤ÎÂå¤ï¤ê¤Ë ASCII ¤Î¹õ´Ýµ­¹æ ('%c')"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: ÆþÎÏ¤Ï \"%s\" ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ë¤ª¤¤¤ÆÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: \"%s\" ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤«¤é \"%s\" ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ËÊÑ´¹¤¹¤ëºÝ¤Ë¥¨¥é¡¼¤¬"
 "ȯÀ¸¤·¤Þ¤·¤¿"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¥Ø¥Ã¥À¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2937,7 +2941,7 @@ msgstr ""
 "\"%s\" ¤«¤é \"%s\" ¤ËÊÑ´¹¤Ç¤­¤Þ¤»¤ó. %s ¤Ï iconv() ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¤¬,"
 "iconv() ¤Ï¤³¤ÎÊÑ´¹¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2946,8 +2950,8 @@ msgstr ""
 "\"%s\" ¤«¤é \"%s\" ¤Ø¤ÎÊÑ´¹¤¬½ÅÊ£, ¤¤¤¯¤Ä¤«¤Î°Û¤Ê¤Ã¤¿ msgid ¤¬Åù¤·¤¯¤Ê¤Ã¤Æ¤¤"
 "¤Þ¤¹."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3375,7 +3379,7 @@ msgstr "ʸ»úÎóÃæ¤Î end-of-line"
 msgid "context separator <EOT> within string"
 msgstr "ʸ»úÎóÃæ¤Îʸ̮¥»¥Ñ¥ì¡¼¥¿ <EOT>"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥É¥á¥¤¥óÌ¿Îá¤ò´Þ¤ó¤Ç¤¤¤Ê¤¤¤è¤¦¤Ç¤¹"
@@ -3396,31 +3400,31 @@ msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥°¥ë¡¼¥×̾"
 msgid "invalid non-blank character"
 msgstr "ÉÔÀµ¤ÊÈó¥Ö¥é¥ó¥¯Ê¸»ú"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "\"%s\" ¤Î¸å¤Ë '=' ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "ÉÔÀµ¤ÊÈó¥Ö¥é¥ó¥¯¹Ô"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤¬Ã»¤¯ÀÚ¤ê¼Î¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ï½ªÃ¼¤¬ NUL ¤Ç¤Ê¤¤Ê¸»úÎó¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ï GNU ¤Î .mo ·Á¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ï %s ¤Ë½ªÃ¼¤¬ NUL ¤Ç¤Ê¤¤Ê¸»úÎó¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
@@ -3603,24 +3607,24 @@ msgstr "C# ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. --verbose ¤ò»î¤·¤Æ¤¯¤À¤µ¤¤"
 msgid "compilation of C# class failed"
 msgstr "C# ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" ¤Ë½ñ¤­¹þ¤â¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "Àµ¤·¤¤ Java ¥¯¥é¥¹Ì¾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. --verbose ¤ò»î¤¹¤« $JAVAC ¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "Java ¥¯¥é¥¹¤Î¥³¥ó¥Ñ¥¤¥ë¤Ë¼ºÇÔ. $JAVAC ¤òÀßÄꤷ¤Æ¤ß¤Æ¤¯¤À¤µ¤¤"
@@ -3733,12 +3737,12 @@ msgstr ""
 "¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°¤Ë¤ÏÊ£¿ô·Á¤ÎËÝÌõ¤¬¤¢¤ê¤Þ¤¹.\n"
 "¤·¤«¤· Tcl ¥á¥Ã¥»¡¼¥¸¥«¥¿¥í¥°·Á¼°¤ÏÊ£¿ô·Á¤Î½èÍý¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: ·Ù¹ð: Àµµ¬É½¸½¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
@@ -3758,7 +3762,7 @@ msgstr "%s:%d: ·Ù¹ð: ʸ»úÄê¿ô¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: ·Ù¹ð: ʸ»úÎó¤Ë½ªÃ¼¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "--from-code ¤ÇÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤."
 
@@ -3798,7 +3802,7 @@ msgstr ""
 "%s:%d: ¹ÔËö¤ËÉÔÀµ¤Ê¥Þ¥ë¥Á¥Ð¥¤¥È¥·¡¼¥±¥ó¥¹.\n"
 "--from-code ¤ÇÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ¤Î¼ºÇÔ"
@@ -3812,7 +3816,7 @@ msgstr ""
 "%s:%d: ÉÔÀµ¤Ê¥Þ¥ë¥Á¥Ð¥¤¥È¥·¡¼¥±¥ó¥¹.\n"
 "--from-code ¤ÇÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: ·Ù¹ð: ÉÔÀµ¤Ê Unicode ʸ»ú"
@@ -3832,54 +3836,54 @@ msgstr "%s:%d: ·Ù¹ð: '}' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë ')' ¤¬¤¢¤ê¤Þ¤¹"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: ·Ù¹ð: ')' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë '}' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "'%s' ¤ÏÍ­¸ú¤Ê¥¨¥ó¥³¡¼¥É̾¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. Âå¤ï¤ê¤Ë ASCII ¤ò»ÈÍÑ.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "¹½Ê¸¥Á¥§¥Ã¥¯ '%s' ¤ÏÃΤê¤Þ¤»¤ó"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "ʸËö¤Î¥¿¥¤¥× '%s' ¤ÏÃΤê¤Þ¤»¤ó"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing ¤Ï½ÐÎÏÀ褬ɸ½à½ÐÎϤξì¹ç¤Ë¤Ï»È¤¨¤Þ¤»¤ó"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ¤Ï¸¡º÷¤¹¤ë¥­¡¼¥ï¡¼¥É¤¬¤Ê¤±¤ì¤ÐÆ°¤­¤Þ¤»¤ó"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "·Ù¹ð: ITS ¥ë¡¼¥ë¥Õ¥¡¥¤¥ë '%s' ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 "·Ù¹ð: ITS ¥ë¡¼¥ë¥Õ¥¡¥¤¥ë '%s' ¤¬¤¢¤ê¤Þ¤»¤ó. gettext ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò³Îǧ"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "·Ù¹ð: ¥Õ¥¡¥¤¥ë '%s' (³ÈÄ¥»Ò '%s') ¤Ï̤ÃΤηÁ¼°¤Ê¤Î¤Ç C ¸À¸ì¤ò»î¤·¤Þ¤¹"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Í¿¤¨¤é¤ì¤¿ÆþÎÏ¥Õ¥¡¥¤¥ë¤«¤éËÝÌõ²Äǽ¤Êʸ»úÎó¤ò¼è¤ê½Ð¤·¤Þ¤¹.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3887,23 +3891,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME   ½ÐÎÏ¤Ë NAME.po ¤ò»ÈÍÑ (message.po ¤ÎÂå¤ï¤ê)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           »ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë½ÐÎÏ\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DIR        ¥Ç¥£¥ì¥¯¥È¥ê DIR ¤Ë¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë¸À¸ì¤ÎÁªÂò:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3924,19 +3928,19 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ¤Îû½Ì·Á\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "ɸ½à¤Ç¸À¸ì¤ÏÆþÎÏ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ç¼±Ê̤µ¤ì¤Þ¤¹.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3945,22 +3949,22 @@ msgstr ""
 "      --from-code=NAME           ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°\n"
 "                                         (Python, Tcl, Glade °Ê³°)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "ɸ½à¤Ç¤Ï, ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ï ASCII ¤È²¾Äꤵ¤ì¤Þ¤¹.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         ¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤È¥á¥Ã¥»¡¼¥¸¤ò·ë¹ç\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  FILE.po ¤«¤é¤Î¹àÌܤÏÃê½Ð¤µ¤ì¤Ê¤¤\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3974,18 +3978,18 @@ msgstr ""
 "  -c, --add-comments[=TAG]    ¥­¡¼¥ï¡¼¥É¹Ô¤Þ¤Ç¤ÎÁ´¤Æ¤Î¥³¥á¥ó¥ÈÉôʬ¤ò\n"
 "                                ½ÐÎÏ¥Õ¥¡¥¤¥ë¤ËÆþ¤ì¤ë\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NAME            ¥á¥Ã¥»¡¼¥¸¤ËÂФ·¤Æ¹½Ê¸¥Á¥§¥Ã¥¯¤ò¼Â¹Ô\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3996,17 +4000,17 @@ msgstr ""
 "                                (single-space ¤Þ¤¿¤Ï double-space, \n"
 "                                 ɸ½à¤Ï single-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "¸À¸ì»ØÄꥪ¥×¥·¥ç¥ó:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           Á´¤Æ¤Îʸ»úÎó¤òÃê½Ð\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4021,7 +4025,7 @@ msgstr ""
 "                                C#, awk. Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala ¸À¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4036,7 +4040,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4047,7 +4051,7 @@ msgstr ""
 "¤¹¤ë\n"
 "                              Éղåե饰\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4062,63 +4066,68 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala ¸À¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ÆþÎϤµ¤ì¤¿ ANSI C ¥È¥é¥¤¥°¥é¥Õ¤òǧ¼±\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (C, C++, ObjectiveC ¸À¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=FILE              FILE ¤«¤é ITS ¥ë¡¼¥ë¤òŬÍÑ\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (XML¥Ù¡¼¥¹¤Î¸À¸ì¤Î¤ß)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt ·Á¼°¤Îʸ»úÎó¤òǧ¼±\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ ¸À¸ì¤Î¤ß)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   KDE 4 ·Á¼°¤Îʸ»úÎó¤òǧ¼±\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost ·Á¼°¤Îʸ»úÎó¤òǧ¼±\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 ¤è¤ê¾ÜºÙ¤Ê¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Îǧ¼±·ë²Ì\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     Java .properties ¥Õ¥¡¥¤¥ë¤ò½ÐÎÏ\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=FILE              FILE ¤«¤é ITS ¥ë¡¼¥ë¤òŬÍÑ\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               itstool ¥³¥á¥ó¥È¤ò½ñ¤­½Ð¤·\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  Ãøºî¸¢ÊÝÍ­¼Ô¤ò½ÐÎϤÇÀßÄê\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4126,24 +4135,24 @@ msgstr ""
 "      --foreign-user          GNU ¥×¥í¥¸¥§¥¯¥È°Ê³°¤Î¥æ¡¼¥¶¸þ¤±¤Ë½ÐÎÏÃæ¤Î FSF "
 "Ãøºî¸¢¤ò¾Êά\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  ¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò½ÐÎϤÇÀßÄê\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  ¥Ñ¥Ã¥±¡¼¥¸¥Ð¡¼¥¸¥ç¥ó¤ò½ÐÎϤÇÀßÄê\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  msgid ¤Î¥Ð¥°Êó¹ðÍÑ¥¢¥É¥ì¥¹¤òÀßÄê\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4154,7 +4163,7 @@ msgstr ""
 "\"\"\n"
 "                                ¤ò»ÈÍÑ\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4165,7 +4174,7 @@ msgstr ""
 "\"\"\n"
 "                                ¤ò»ÈÍÑ\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4173,31 +4182,31 @@ msgid ""
 msgstr ""
 "--flag °ú¿ô¤Ï <keyword>:<argnum>:[pass-]<flag> ʸˡ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "ɸ½àÆþÎÏ"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s ¤ËÈóASCIIʸ»ú."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s ¤Þ¤¿¤Ï¤½¤ÎÁ°¤ËÈóASCII¥³¥á¥ó¥È."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s ¤ËÈóASCIIʸ»úÎó."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: ·Ù¹ð: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4206,7 +4215,7 @@ msgstr ""
 "¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Î°ÌÃ֤ǻȤï¤ì¤Æ¤¤¤Þ¤¹¤¬, %s ¤ÏÀµ¤·¤¤ %s ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó"
 "¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. Íýͳ: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4215,7 +4224,7 @@ msgstr ""
 "¤½¤Î¤è¤¦¤ËÀë¸À¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬, '%s' ¤ÏÀµ¤·¤¤ %s ·Á¼°¤Îʸ»úÎó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. Íý"
 "ͳ: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4228,7 +4237,7 @@ msgstr ""
 "̾Á°ÉÕ¤­°ú¿ô¤Î¤¢¤ë¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ò»È¤¦¤³¤È, ³î¤Ä°ú¿ô¤ËÂФ·¤ÆÁÈ (tuple)\n"
 "¤ÎÂå¤ï¤ê¤Ë¥Þ¥Ã¥Ô¥ó¥°¤ò»È¤¦¤³¤È¤ò¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4238,27 +4247,27 @@ msgstr ""
 "gettext(\"\") ¤Ï¥á¥¿¾ðÊó¤ÎÉÕ¤¤¤¿¥Ø¥Ã¥À¥¨¥ó¥È¥ê¤òÊÖ¤·¤Þ¤¹¤¬\n"
 "¶õ¤Îʸ»úÎó¤ÏÊÖ¤·¤Þ¤»¤ó.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "¥­¡¼¥ï¡¼¥É '%.*s' ¤ËÂФ¹¤ë°ú¿ô»ØÄ꤬ۣËæ¤Ç¤¹"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "·Ù¹ð: ¥­¡¼¥ï¡¼¥É '%.*s' ¤ËÂФ¹¤ëʸ̮¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "·Ù¹ð: ¥­¡¼¥ï¡¼¥É '%.*s' ¤ÎÊ£¿ô·Á°ú¿ô¤Ëʸ̮¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ʸ̮¤¬Ã±¿ô·Ï¤ÈÊ£¿ô·Á¤Ç°ìÃפ·¤Þ¤»¤ó"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4270,7 +4279,7 @@ msgstr ""
 "¤¤.\n"
 "¤â¤·¤¯¤Ï, ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó --msgid-bugs-address ¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "¸À¸ì '%s' ¤ÏÃΤê¤Þ¤»¤ó"
@@ -4379,7 +4388,7 @@ msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\L\") 8bit ʸ»ú \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ÉÔÀµ¤ÊÊä´Ö (\"\\U\") 8bit ʸ»ú \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4388,7 +4397,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4400,7 +4409,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4412,7 +4421,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4424,7 +4433,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4436,7 +4445,7 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4448,22 +4457,22 @@ msgstr ""
 "¤ò\n"
 "»È¤Ã¤ÆÀµ¤·¤¤ÆþÎÏ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "̤ÃΤΥ¨¥ó¥³¡¼¥Ç¥£¥ó¥° \"%s\". Âå¤ï¤ê¤Ë ASCII ¤È¤·¤Æ¿Ê¤á¤Þ¤¹."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ÉÔÀµ¤Êʸ»úÎóÄêµÁ"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # ¤Î¸å¤Ë¿ô»ú¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ÉÔÀµ¤Êʸ»úÎóɽ¸½"
diff --git a/gettext-tools/po/ko.gmo b/gettext-tools/po/ko.gmo
index 8e6969a..c43b887 100644
--- a/gettext-tools/po/ko.gmo
+++ b/gettext-tools/po/ko.gmo
diff --git a/gettext-tools/po/ko.po b/gettext-tools/po/ko.po
index 2c4ea5e..eda921f 100644
--- a/gettext-tools/po/ko.po
+++ b/gettext-tools/po/ko.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the gettext package.
 #
 # Bang Jun-Young <bangjy@geocities.com>, 1995-1997.
-# Changwoo Ryu <cwryu@debian.org>, 2001-2005, 2007, 2009-2010, 2013-2015.
+# Changwoo Ryu <cwryu@debian.org>, 2001-2005, 2007, 2009-2010, 2013-2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.4.73\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-06-28 05:22+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-05 08:30+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@googlegroups.com>\n"
 "Language: ko\n"
@@ -110,7 +110,7 @@ msgid "Unknown system error"
 msgstr "알 수 없는 시스템 오류"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -188,15 +188,15 @@ msgstr "compile_java_class� 대한 source_version ��가 잘못�었습니
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class� 대한 target_version ��가 잘못�었습니다"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\"�(를) 만드는 � 실패했습니다"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -221,39 +221,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s 하위 프로세스 입출력 오류"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "메모리가 바닥났습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "스레드 만들기� 실패했습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s 하위 프로세스� 쓰기가 실패했습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "%s 하위 프로세스�서 �기� 실패했습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "%s 하위 프로세스� 넌블로킹 입출력� 준비할 수 없습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "%s 하위 프로세스� 통신� 실패했습니다"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s 하위 프로세스가 종료 코드 %d번으로 �났습니다"
@@ -292,18 +292,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr "%s� 대한 권한 설정"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "파�프를 만들 수 없습니다"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 실패"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "파� 디스�립터 %d번� 복구할 수 없습니다: dup2 실패"
@@ -323,33 +323,33 @@ msgstr "%s 하위 프로세스가 치명ì �ì�¸ 시그ë„� %d번ì�„ 받았습니ë‹
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
-msgstr ""
+msgstr "루트 엘리먼트는 <%s>�(가) �어야 합니다"
 
 # XML 엘리먼트를 �한다
 #: src/cldr-plurals.c:83
-#, fuzzy, c-format
+#, c-format
 msgid "The element <%s> does not contain a <%s> element"
-msgstr "글레�드 파��서 최�위 엘리먼트로 <%s>�(는) 허용하지 않습니다"
+msgstr "<%s> 엘리먼트� <%s> 엘리먼트가 들어있지 않습니다"
 
 #: src/cldr-plurals.c:105 src/cldr-plurals.c:146
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
-msgstr ""
+msgstr "<%s> 엘리먼트� <%s> �성� 없습니다"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "� 많� 정보를 보려면 '%s --help' 하십시오.\n"
 
 #: src/cldr-plurals.c:195
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
-msgstr "사용법: %s [<옵션>] [<파�>]...\n"
+msgstr "사용법: %s [옵션...] [로캘 규칙]...\n"
 
 #: src/cldr-plurals.c:200
 #, c-format, no-wrap
@@ -360,8 +360,13 @@ msgid ""
 "LOCALE from RULES and print them in a form suitable for gettext use.\n"
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
+"유니코드 CLDR 복수형 규칙� 추출하거나 변환합니다.\n"
+"\n"
+"<로캘>과 <규칙>� 모� 지정하면, <규칙> 파��서 <로캘>� 대한 CLDR\n"
+"복수형 규칙� �어서 gettext� 사용하기 �합한 형태로 출력합니다.\n"
+"��를 지정하지 않으면, 표준 입력�서 CLDR 복수형 규칙� �습니다.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -371,26 +376,26 @@ msgstr ""
 "없어� �는 ��� 마찬가지입니다.\n"
 
 #: src/cldr-plurals.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -h, --help                  � �움�� 보여주고 �납니다\n"
+msgstr "  -c, --cldr                  CLDR 형�으로 복수 규칙� 표시합니다\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  � �움�� 보여주고 �납니다\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               버전 정보를 표시하고 �납니다\n"
@@ -400,20 +405,20 @@ msgstr "  -V, --version               버전 정보를 표시하고 �납니다
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "<bug-gnu-gettext@gnu.org>로 문제�� 알려 주십시오.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -427,10 +432,10 @@ msgstr ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s�(가) 만들었습니다.\n"
@@ -438,60 +443,60 @@ msgstr "%s�(가) 만들었습니다.\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cldr-plurals.c:295
 msgid "Daiki Ueno"
-msgstr ""
+msgstr "다�키 우�노"
 
 #: src/cldr-plurals.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s cannot be read"
-msgstr "%s 파�� 있지만 �� 수 없습니다"
+msgstr "%s�(를) �� 수 없습니다"
 
 #: src/cldr-plurals.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "cannot extract rules for %s"
-msgstr "임시 디렉터리 %s�(를) 지울 수 없습니다"
+msgstr "%s� 대한 규칙� 추출할 수 없습니다"
 
 #: src/cldr-plurals.c:331
 #, c-format
 msgid "cannot parse CLDR rule"
-msgstr ""
+msgstr "CLDR 규칙� 파싱할 수 없습니다"
 
 #: src/cldr-plurals.c:366
 #, c-format
 msgid "extra operand %s"
-msgstr ""
+msgstr "추가 피연산� %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "�으려고 \"%s\"�(를) 여는 �안 오류 발�"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "'%2$s' 안� 있는, �� %1$u� 대한 서� 지정� '%3$s'� 없습니다"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "�� %u� 대한 서� 지정� '%s'� 없습니다"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -528,8 +533,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "문�열� �� 번호  %u�(를) 참조하지만 �� 번호 %u�(를) 무시합니다."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "'%s'과(와) '%s'� 쓰� 서� 지정�� 개수가 �치하지 않습니다"
@@ -835,8 +839,8 @@ msgstr "'%s'과(와) '%s'� 서� 지정� �등하지 않습니다"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "'%s' 안� 있는 서� 지정� '%s'� 없습니다"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "�� '%s'� 대한 서� 지정� '%s'� 없습니다"
@@ -853,28 +857,28 @@ msgstr "지시ìž� %u번ì—�ì„œ, í�¬ê¸° 지정ì�€ '%c' 변환 지정과 호환ë�˜ì
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "지시� %u번�서, 필드 �름� '%c' 문�로 시작할 수 없습니다."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "지시� %u번�서, getattr ��가 '%c' 문�로 시작할 수 없습니다."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "지시� %u번�서, getitem ��가 '%c' 문�로 시작할 수 없습니다."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "지시� %u번�서, �맷 지정�서 � ��� 네스팅� 허용하지 않습니다."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "지시� %u번�서, �맷 지시�를 마치지 않았습니다."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -882,31 +886,31 @@ msgstr ""
 "문�열� �� �름� 통한 방법과 �름없� 지정하는 방법 � 가지로 ��를 참조"
 "합니다."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "문�열� 호환�지 않는 방법으로 '%s'(�)�는 �름� ��를 참조합니다."
 
 # mapping과 tuple: python ��타 구조
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "'%s'� 서� 지정�는 매핑� 필요한�, '%s'�는 터플� 필요합니다"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "'%s'� 서� 지정�는 터플� 필요한�, '%s'�는 매핑� 필요합니다"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "'%2$s' 안� 있는, �� '%1$s'� 대한 서� 지정� '%3$s'� 없습니다"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -958,7 +962,7 @@ msgid ""
 msgstr "지시� %u번� �마치는 문�가 1과 9 사�� 숫�가 아닙니다."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -973,7 +977,7 @@ msgstr "�수가 너무 많�"
 #: src/hostname.c:214 src/msginit.c:363 src/recode-sr-latin.c:149
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr "사용법: %s [<옵션>]\n"
+msgstr "사용법: %s [옵션]\n"
 
 #: src/hostname.c:218
 #, c-format
@@ -1005,11 +1009,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      호스트�름� 대한 주소\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "정보 출력:\n"
@@ -1020,60 +1024,60 @@ msgid "could not get host name"
 msgstr "호스트�름� 알아낼 수 없습니다"
 
 #: src/its.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "selector is not specified"
-msgstr "최소한 파� � 개를 지정해야 합니다"
+msgstr "셀렉터를 지정하지 않았습니다"
 
 #: src/its.c:326 src/its.c:1550
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create XPath context"
-msgstr "파�프를 만들 수 없습니다"
+msgstr "XPath 컨�스트를 만들 수 없습니다"
 
 #: src/its.c:344
 #, c-format
 msgid "cannot evaluate XPath expression: %s"
-msgstr ""
+msgstr "XPath 표현�� 확�할 수 없습니다: %s"
 
 #: src/its.c:614
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
-msgstr ""
+msgstr "\"%s\" 노드� \"%s\"�(가) 없습니다"
 
 #: src/its.c:1001
-#, fuzzy, c-format
+#, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
-msgstr "`%2$s'� 대한 �� `%1$s'�(가) 잘못�었습니다"
+msgstr "\"%2$s\"� 대한 �성값 \"%1$s\"�(가) 잘못�었습니다"
 
 #: src/its.c:1333
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
-msgstr ""
+msgstr "%s 네임스페�스�서 루트 엘리먼트가 \"rules\"가 아닙니다"
 
 #: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
 #: src/locating-rule.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read %s: %s"
-msgstr "파�프를 만들 수 없습니다"
+msgstr "%s�(를) �� 수 없습니다: %s"
 
 #: src/its.c:1573
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
-msgstr ""
+msgstr "XPath 위치 경로를 확�할 없습니다: %s"
 
 #: src/locating-rule.c:236
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" node does not have \"%s\""
-msgstr "%s 파�� 없습니다"
+msgstr "\"%s\" 노드� \"%s\"�(가) 없습니다"
 
 #: src/locating-rule.c:307
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read XML file %s"
-msgstr "출력 파� \"%s\"�(를) 만들 수 없습니다"
+msgstr "%s XML 파�� �� 수 없습니다"
 
 #: src/locating-rule.c:319
 #, c-format
 msgid "the root element is not \"locatingRules\""
-msgstr ""
+msgstr "루트 엘리먼트가 \"locatingRules\"가 아닙니다"
 
 #: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
 #: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
@@ -1081,12 +1085,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "최대 한 개� 입력파�만� 허용�니다"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s과(와) %s�(는) 서로 배타�입니다"
@@ -1103,7 +1107,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr "번역 메시지를 그 �성� 따� 걸러내고, 그 �성� 조작합니다.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1112,10 +1116,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "긴 옵션�서 꼭 필요한 �수는 짧� 옵션�� 꼭 필요합니다.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "입력 파� 위치:\n"
@@ -1125,10 +1129,10 @@ msgstr "입력 파� 위치:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  <입력파�>                     입력 PO 파�\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1141,23 +1145,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "입력 파�� 주어지지 않거나 \"-\"�면, 표준 입력�서 �습니다.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "출력 파� 위치:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=<파�>   지정한 파�로 출력합니다\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1168,7 +1172,7 @@ msgstr ""
 "만약 출력 파�� 지정�지 않았거나 \"-\"� 경우, 결과물� 표준 출력으로 \n"
 "출력합니다.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "메시지 선�:\n"
@@ -1287,9 +1291,9 @@ msgstr ""
 "      --obsolete              \"--only-obsolete --clear-obsolete\"와 ��합니"
 "다\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1313,17 +1317,17 @@ msgstr ""
 "      --stringtable-input     입력 파�� NeXTstep/GNUstep .strings 문법입니"
 "다\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "출력 �세:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1336,26 +1340,26 @@ msgstr ""
 "                              <�황>� 'always', 'never', 'auto', 혹� "
 "'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=<스타�파�>    --color 옵션� 대해 CSS 스타�� 지정합니다\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             출력� C �스케�프를 쓰지 않습니다(기본값)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1363,68 +1367,68 @@ msgstr ""
 "  -E, --escape                출력� C �스케�프를 쓰고 확장 문�를 쓰지 않"
 "습니다\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              비어 있는 파���� PO 파�로 �니다\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                들여쓰기� 스타�로 .po 파�� �니다\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: 파�_�름:줄번호' 줄� 쓰지 않습니다\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          '#: 파�_�름:줄번호' 줄� 만듭니다(기본값)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                엄격하게 유니�럼� 따르는 .po 파�� �니다\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     �바 .properties 파�� �니다\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output     NeXTstep/GNUstep .strings 파�� �니다\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=<숫�>          출력 페�지� 너비를 지정합니다\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1433,31 +1437,31 @@ msgstr ""
 "      --no-wrap               출력 페�지 �보다 긴 메시지 ��� 여러 줄로\n"
 "                              �르지 않습니다.\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           정렬� 출력� 만들어 냅니다\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          파� 위치� 따� 출력� 정렬합니다\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "불가능한 선� 조건� 지정하였습니다(%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "사용법: %s [<옵션>] [<입력파�>]...\n"
+msgstr "사용법: %s [옵션] [입력파�]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1479,23 +1483,23 @@ msgstr ""
 "나타나는 가장 첫 번째 PO 파�� 들어 있는 모든 PO 파��서 파� 위치는 그대로\n"
 "유지�니다.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  입력파� ...                입력 파�\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=<파�>     입력 파�� 목�� <파�>�서 �습니다\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "입력 파�� -�면, 표준 입력� �습니다.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1504,7 +1508,7 @@ msgstr ""
 "  -<, --less-than=<�기>      지정한 것보다 �� 메시지만� 출력합니다.\n"
 "                              � 옵션� 없� 경우� 기본값� 무한대입니다.\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1513,7 +1517,7 @@ msgstr ""
 "  -<, --less-than=<�기>      지정한 것보다 많� 메시지만� 출력합니다.\n"
 "                              � 옵션� 없� 경우� 기본값� 무한대입니다.\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1522,7 +1526,7 @@ msgstr ""
 "  -u, --unique                --less-than=2를 짧게 쓴 것입니다.\n"
 "                              유�한 메시지만� 출력합니다.\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1531,7 +1535,7 @@ msgstr ""
 "  -P, --properties-input      입력 파�� �바 .properties 문법으로 �어 있습"
 "니다\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1541,12 +1545,12 @@ msgstr ""
 "      --stringtable-input     입력 파�� NeXTstep/GNUstep .strings 문법입니"
 "다\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=<�름>          출력� �코딩\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1555,14 +1559,14 @@ msgstr ""
 "      --use-first               � 메시지중�서 첫번째로 나타나는 번역문만\n"
 "                                사용하고, 여러 번역문� 합치지 않습니다\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=<목��름>       헤�� 'Language' 항목� 설정합니다\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "피터 밀러(Peter Miller)"
 
@@ -1579,7 +1583,7 @@ msgstr "정확히 2개� 입력 파�� 필요합니다"
 #: src/msgcmp.c:214 src/msgmerge.c:499
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "사용법: %s [<옵션>] def.po ref.pot\n"
+msgstr "사용법: %s [옵션] def.po ref.pot\n"
 
 #: src/msgcmp.c:219
 #, c-format, no-wrap
@@ -1667,18 +1671,18 @@ msgstr "� 메시지는 사용�지만 %s�서 정��지 않았습니다"
 msgid "warning: this message is not used"
 msgstr "경고: � 메시지는 사용�지 않습니다"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "치명�� 오류 %d개를 찾았습니다"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "최소한 파� � 개를 지정해야 합니다"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1697,7 +1701,7 @@ msgstr ""
 "주�문� 모� 유지� 것�지만, 정�하려면 첫 번째 PO 파��서만 유지�니다. 모든\n"
 "PO 파��서 파� 위치는 누��니다.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1706,7 +1710,7 @@ msgstr ""
 "  ->, --more-than=<�기>         지정한 것보다 많� 메시지만� 출력합니다.\n"
 "                                 � 옵션� 없� 경우� 기본값� 1입니다.\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1754,7 +1758,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                엄격한 Uniforum 출력 형태로 �니다\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "입력 파�� 주어지지 않았습니다"
@@ -1767,7 +1771,7 @@ msgstr "정확히 한 개� 입력 파�� 필요합니다"
 #: src/msgen.c:305
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "사용법: %s [<옵션>] <입력파�>\n"
+msgstr "사용법: %s [옵션] <입력파�>\n"
 
 #: src/msgen.c:310
 #, c-format, no-wrap
@@ -1794,7 +1798,7 @@ msgstr "명령어 �름� 빠졌습니다"
 #: src/msgexec.c:264
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "사용법: %s [<옵션>] <명령어> [<명령어-옵션>]\n"
+msgstr "사용법: %s [옵션] <명령어> [명령어-옵션]\n"
 
 #: src/msgexec.c:269
 #, c-format, no-wrap
@@ -1853,7 +1857,7 @@ msgstr "최소한 한 개� sed 스�립트를 지정해야 합니다"
 #: src/msgfilter.c:414
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "사용법: %s [<옵션>] <필터> [<필터-옵션>]\n"
+msgstr "사용법: %s [옵션] <필터> [필터-옵션]\n"
 
 #: src/msgfilter.c:418
 #, c-format
@@ -1937,114 +1941,114 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "필터 출력� 줄바꿈으로 �나지 않습니다"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s� ��는 한 개� 구�� 문�여야 합니다"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "엔디안� 틀렸습니다: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "울리히 드레�(Ulrich Drepper)"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "%s � %s 옵션� 사용하면 입력 파�� 지정하지 않아야 합니다"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 옵션� \"-d <디렉터리>\" 지정� 필요합니다"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 옵션� \"-d <로캘>\" 지정� 필요합니다"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s 옵션� \"--template <서�>\" 지정� 필요합니다"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s 옵션� \"-o <파�>\" 지정� 필요합니다"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s � %s 옵션� %s�서 서로 배타�입니다"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 옵션� %s 혹� %s 옵션과 함께 �야만 효과가 있습니다"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 옵션� %s, %s �는 %s 옵션과 함께 �야만 효과가 있습니다"
 
-#: src/msgfmt.c:723
-#, fuzzy, c-format
+#: src/msgfmt.c:713
+#, c-format
 msgid "cannot locate ITS rules for %s"
-msgstr "출력 파� \"%s\"�(를) 만들 수 없습니다"
+msgstr "%s� 대한 ITS 규칙� 찾� 수 없습니다"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "번역� 메시지 %d개"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", �지 번역문 %d개"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", 번역�지 않� 메시지 %d개"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "사용법: %s [<옵션>] <파��름>.po ...\n"
+msgstr "사용법: %s [옵션] <파��름>.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "주어진 번역문�서 �진 메시지 목� 파�� 만들어 냅니다.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  <파��름>.po ...             입력 파�\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "�작 모드:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2053,7 +2057,7 @@ msgstr ""
 "  -j, --java                  �바 모드: �바 ResourceBundle �래스를 만듭니"
 "다\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2062,12 +2066,12 @@ msgstr ""
 "      --java2                 --java와 같지만, Java2를 가정합니다(JDK 1.2 �"
 "�)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 모드: .NET .dll 파�� 만듭니다\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2076,72 +2080,72 @@ msgstr ""
 "      --csharp-resources      C# 리소스 모드: .NET .resources 파�� 만듭니"
 "다\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl 모드: tcl/msgcat .msg 파�� 만듭니다\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 모드: Qt .qm 파�� 만듭니다\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 "      --desktop               desktop 항목 모드: .desktop 파�� 만듭니다\n"
 
-#: src/msgfmt.c:957
-#, fuzzy, c-format
+#: src/msgfmt.c:947
+#, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
-msgstr "      --qt                    Qt 모드: Qt .qm 파�� 만듭니다\n"
+msgstr "      --xml                   XML 모드: XML 파�� 만듭니다\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                   엄격한 Uniforum 출력 형태로 �니다\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "출력 파�� -�면, 출력� 표준 출력� �니다.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "�바 모드�서 출력 파� 위치:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=<리소스>     리소스 �름\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr "  -l, --locale=<로캘>         로캘 �름, 언어 혹� 언어_국가\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr "      --source                .class 파� 대신 .java 파�� 만듭니다\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d <디렉터리>               �래스 디렉터리 구조� 베�스 디렉터리\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2153,19 +2157,19 @@ msgstr ""
 "�름으로 결정�니다. -d 옵션� 꼭 필요합니다. �래스는 지정한 디렉터리\n"
 "아래� 출력�니다.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# 모드�서 출력 파� 위치:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr "  -d <디렉터리>               로캘 �존  .dll 파�� 베�스 디렉터리\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2174,17 +2178,17 @@ msgstr ""
 "-l과 -d 옵션� 꼭 필요합니다. .dll 파�� 지정한 디렉터리�(로캘� 따� 달�"
 "지는 �름�) 아래 디렉터리� �니다.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 모드�서 출력 파� 위치:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d <디렉터리>               .msg 메시지 목�� 베�스 디렉터리\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2192,24 +2196,24 @@ msgid ""
 msgstr "-l과 -d 옵션� 꼭 필요합니다. .msg 파�� 지정한 디렉터리� �니다.\n"
 
 # freedesktop.org desktop� �한다
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "desktop 항목 모드 옵션:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=<서�>           .desktop 파�� 서�으로 사용\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 "  -d <디렉터리>               .po 파�� 베�스 디렉터리\n"
 "\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2218,7 +2222,7 @@ msgstr ""
 "  -k<단어>, --keyword=<단어>     <단어>를 추가 키워드로 찾습니다\n"
 "  -k, --keyword                  기본 키워드를 사용하지 않습니다\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2229,27 +2233,27 @@ msgstr ""
 "행 대신 디렉터리�서 �습니다.\n"
 
 # freedesktop.org desktop� �한다
-#: src/msgfmt.c:1024
-#, fuzzy, c-format
+#: src/msgfmt.c:1014
+#, c-format
 msgid "XML mode options:\n"
-msgstr "desktop 항목 모드 옵션:\n"
+msgstr "XML 모드 옵션:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
-msgstr ""
+msgstr "  -L, --language=<�름>       지정한 XML 언어를 ��합니다\n"
 
-#: src/msgfmt.c:1032
-#, fuzzy, c-format
+#: src/msgfmt.c:1022
+#, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
-msgstr "  --template=<서�>           .desktop 파�� 서�으로 사용\n"
+msgstr "  --template=<서�>           서�으로 사용하는 XML 파�\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "입력 파� 해�:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2260,12 +2264,12 @@ msgstr ""
 "                              --check-domain�서 하는 검사를 모� 수행합니"
 "다\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          언어� 따� �맷 문�열� 검사합니다\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2273,7 +2277,7 @@ msgid ""
 msgstr ""
 "      --check-header          헤� 항목� 있는지와 그 내용� 검사합니다\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2282,7 +2286,7 @@ msgstr ""
 "      --check-domain          �메� 지정과 --output-file 옵션� �메��\n"
 "                              충�하지 않는지 검사합니다\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2290,7 +2294,7 @@ msgid ""
 msgstr ""
 "  -C, --check-compatibility   GNU msgfmt� X/Open� msgfmt처럼 검사합니다\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2300,12 +2304,12 @@ msgstr ""
 "      --check-accelerators[=CHAR]  메뉴 항목� 키보드 단축글쇠가 있는지 \n"
 "                              검사합니다\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             출력� �지 항목� 사용합니다\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2313,7 +2317,7 @@ msgstr ""
 "  -a, --alignment=<�기>      문�열� <�기> 바�트� 정렬합니다(기본값: "
 "%d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2324,92 +2328,92 @@ msgstr ""
 "      --endianness=<바�트순> 32비트 수를 주어진 바�트 순서로 �니다\n"
 "                                (big �는 little, 기본값� 플랫�� 따�)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               �진 파�� 해쉬 테�블� 넣지 않습니다\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            번역� 대한 통계를 표시합니다\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               � �세히 출력합니다\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "경고: PO 파� 헤�가 빠졌거나 잘못�었습니다\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "경고: 문�셋 변환� �작하지 않습니다\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "경고: PO 파� 헤�가 �지입니다\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "경고: 과거 버전� msgfmt� 여기� 오류를 낼 것입니다\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "�메��름 \"%s\"�(는) 파� �름으로 알맞지 않습니다"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "�메� �름 \"%s\"�(는) 파� �름으로 알맞지 않습니다. 그러므로 접�사를\n"
 "사용합니다"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "'domain %s' 지시�는 무시�"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "빈 'msgstr' 항목� 무시�"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "�지 'msgstr' 항목� 무시�"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: 경고: 소스 파�� �지 번역문� 들어 있습니다"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s 파�� 없습니다"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s 파�� 있지만 �� 수 없습니다"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\"�(를) �는 �안 오류 발�"
@@ -2644,12 +2648,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s 패키지� 대한 한국어 번역문"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "현재 문�셋 \"%s\"�(는) �리 쓸 수 있는 �코딩 �름� 아닙니다"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "입력 파�� � 개� 문�셋 \"%s\"과(와) \"%s\"�(가) 존재합니다"
@@ -2669,14 +2673,14 @@ msgstr ""
 "입력 파� '%2$s'� �메� \"%1$s\"�는 문�셋� 지정하는 헤� 항목� 들어 있"
 "지 않습니다"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "목표 문�셋 \"%s\"�(는) �리 쓸 수 있는 �코딩 �름� 아닙니다."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "경고: "
@@ -2768,24 +2772,24 @@ msgstr ""
 "'%s'로(으로) 출력하는 것� 틀렸� 수 있습니다.\n"
 "가능한 해결책� \"LC_ALL=C\"로 세팅하는 것입니다.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "복수 표현�� �수 값� 만들 수� 있습니다"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu 하지만 복수 표현�� %lu만� � 값� 만들 수� 있습니다"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "복수 표현�� 0으로 나누는 연산� 할 수� 있습니다"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "복수 표현�� 정수 오버플로우를 발�시킬 수 있습니다"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2793,49 +2797,49 @@ msgstr ""
 "복수 표현�� 연산 예외를 발�시킬 수 있습니다. 0으로 나누는 연산� 할 수 있"
 "습니다"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "다�� 사용해 보십시오. %s� 대해서 올바름:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "메시지 목�� 복수형 번역� 들어 있습니다"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "하지만 헤� 항목�는 \"plural=표현�\" �성� 들어 있지 않습니다"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "하지만 헤� 항목�는 \"nplurals=정수\" �성� 들어 있지 않습니다"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "nplurals 값� 잘못�었습니다"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "잘못� 복수 표현�"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "하지만 어떤 메시지는 복수형� %lu개 밖� 없습니다"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "하지만 어떤 메시지는 복수형� %lu개 있습니다"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2843,88 +2847,93 @@ msgstr ""
 "메시지 목�� 복수형 번역� 들어 있지만, 헤� 항목� \"Plural-Forms: "
 "nplurals=정수; plural=표현�;\"� 없습니다"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid'와 'msgstr_plural' 항목� 모� '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "'msgid'와 'msgstr[%u]' 항목� 모� '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "'msgid'와 'msgstr' 항목� 모� '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "'msgid'와 'msgid_plural' 항목� 모� '\\n'으로 �나지 않습니다"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "'msgid'와 'msgstr[%u]' 항목� 모� '\\n'으로 �나지 않습니다"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "'msgid'와 'msgstr' 항목� 모� '\\n'으로 �나지 않습니다"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "복수 처리는 GNU gettext 확장 기능입니다"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr� 키보드 단축키 '%c'� 대한 표시가 없습니다"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr� 키보드 단축키 '%c' 표시가 너무 많습니다"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "'%s' 헤� 필드가 아�� 초기� 기본값� 가지고 있습니다\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "헤�� 헤� 필드 '%s'�(가) 빠졌�\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "유니코드 �줄임표가 아닌 ASCII �줄임표('...')"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "사용�� 보�는 문�열� �줄임표 앞� 공백� 있습니다"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "유니코드 �따옴표가 아닌 ASCII �따옴표"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "유니코드 홑따옴표가 아닌 ASCII 홑따옴표"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "유니코드 �� 아닌 ASCII �('%c')"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: 입력� \"%s\" �코딩�서 올바르지 않습니다"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: \"%s\" �코딩�서 \"%s\" �코딩으로 변환하는 �안 오류 발�"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "입력 파�� 문�셋� 지정하는 헤� 항목� 들어 있지 않습니다"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2933,7 +2942,7 @@ msgstr ""
 "\"%s\"�서 \"%s\"로(으로) 변환할 수 없습니다. %s�(는) iconv()� �존하지만, "
 "iconv()가 �같� 변환� 지�하지 않습니다."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2942,8 +2951,8 @@ msgstr ""
 "\"%s\"�서 \"%s\"(으)로 변환하면 중복�니다: 다른 � 개 ��� msgid가 똑같"
 "아 집니다."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3108,7 +3117,7 @@ msgstr "%s과(와) 파��름� 명시�으로 지정하는 것� �시�
 #: src/msgunfmt.c:428
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "사용법: %s [<옵션>] [<파�>]...\n"
+msgstr "사용법: %s [옵션] [파�]...\n"
 
 #: src/msgunfmt.c:432
 #, c-format
@@ -3373,7 +3382,7 @@ msgstr "문�열 내부�서 행� �남"
 msgid "context separator <EOT> within string"
 msgstr "문�열 안� 컨�스트 구분 <EOT>가 있습니다."
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "� 파�� �메� 지시�가 안 들어 있� 수� 있습니다"
@@ -3388,39 +3397,37 @@ msgstr "여기는 첫번째 정�� 위치입니다"
 
 #: src/read-desktop.c:267
 msgid "unterminated group name"
-msgstr ""
+msgstr "그룹 �름 마치지 않�"
 
 #: src/read-desktop.c:286
-#, fuzzy
 msgid "invalid non-blank character"
-msgstr "경고: 잘못� 유니코드 문�"
+msgstr "잘못� 공백 아닌 문�"
 
-#: src/read-desktop.c:403
-#, fuzzy, c-format
+#: src/read-desktop.c:405
+#, c-format
 msgid "missing '=' after \"%s\""
-msgstr "필터 �름� 빠졌습니다"
+msgstr "\"%s\" 뒤� '=' 문� 빠�"
 
-#: src/read-desktop.c:466
-#, fuzzy
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
-msgstr "nplurals 값� 잘못�었습니다"
+msgstr "잘못� 공백 아닌 줄"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" 파�� 잘렸습니다"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "\"%s\" 파�� NUL로 �나지 않는 문�열� 있습니다"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" 파�� GNU .mo 형�� 아닙니다"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "\"%s\" 파�� %s 위치� NUL로 �나지 않는 문�열� 있습니다"
@@ -3492,7 +3499,7 @@ msgstr "�수는 � 개�어야 합니다"
 #: src/urlget.c:177
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "사용법: %s [<옵션>] <URL> <파�>\n"
+msgstr "사용법: %s [옵션] <URL> <파�>\n"
 
 #: src/urlget.c:182
 #, c-format, no-wrap
@@ -3597,25 +3604,25 @@ msgstr "C# �래스 컴파�� 실패했습니다. --verbose로 시�해 보
 msgid "compilation of C# class failed"
 msgstr "C# �래스 컴파�� 실패했습니다"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "쓰려고 \"%s\"�(를) 여는 �안 오류 발�"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "올바른 �바 �래스 �름� 아닙니다: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "�바 �래스 컴파�� 실패했습니다. --verbose로 시�해 보거나 $JAVAC 환경변수"
 "를 세팅하십시오"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "�바 �래스 컴파�� 실패했습니다. $JAVAC 환경변수를 세팅하십시오"
@@ -3726,12 +3733,12 @@ msgstr ""
 "메시지 목�� 복수형 번역� 들어 있지만, \n"
 "Tcl 메시지 목� 형�� 복수형� 지�하지 않습니다\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: 경고: 완결�지 않� 문�열"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 경고: 완결�지 않� 정규�"
@@ -3751,7 +3758,7 @@ msgstr "%s:%d: 경고: 완결�지 않� 문� �수"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: 경고: 완결�지 않� 문�열 �수"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "소스 �코딩� --from-code 옵션으로 지정하십시오."
 
@@ -3791,7 +3798,7 @@ msgstr ""
 "%s:%d: 줄 �� 불완전한 다중바�트 시퀀스.\n"
 "올바른 소스 �코딩� --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 실패"
@@ -3805,7 +3812,7 @@ msgstr ""
 "%s:%d: 잘못� 다중바�트 시퀀스.\n"
 "올바른 소스 �코딩� --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: 경고: 잘못� 유니코드 문�"
@@ -3825,53 +3832,53 @@ msgstr "%s:%d: 경고: '}'가 와야 하는 곳� ')'가 발견�었습니다"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 경고: ')가 와야 하는 곳� '}'가 발견�었습니다"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "'%s'�(는) 올바른 �코딩 �름� 아닙니다. ASCII를 대신 사용합니다.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "문법 검사 '%s'�(를) 알 수 없습니다"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "문장 마침 종류 '%s'�(를) 알 수 없습니다"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-exeisting� 출력� 표준출력� 쓰여질 때 사용� 수 없습니다"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext는 검색할 키워드 없�는 �작하지 않습니다"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
-msgstr ""
+msgstr "경고: ITS 규칙 '%s' 파�� 없습니다"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
-msgstr ""
+msgstr "경고: ITS 규칙 '%s' 파�� 없습니다. gettext 설치를 확�해 보십시오"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "경고: '%s' 파�� 확장� '%s'�(를) 알 수 없습니다. C 형�으로 간주함"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "주어진 입력 파��서 번역 가능한 문�열� 뽑아냅니다.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3880,24 +3887,24 @@ msgstr ""
 "  -d, --default-domain=<�름>    출력�(messages.po 대신) <�름>.po를 �니"
 "다\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=<파�>            지정� 파�� 출력합니다\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=<디렉터리>    출력 파�� <디렉터리> 디렉터리� 놓습니다\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "입력 파�� 언어 선�:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3918,12 +3925,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++를 짧게 쓴 것입니다\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3931,7 +3938,7 @@ msgid ""
 msgstr ""
 "기본�으로 입력 파�� 확장�� 따� 어떤 언어를 사용할 지 �작합니다.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3940,24 +3947,24 @@ msgstr ""
 "      --from-code=<�름>      입력 파�� �코딩\n"
 "                                (Python, Tcl, Glade 제외)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "기본값으로 입력 파�� ASCII로 �코딩�어 있다고 가정합니다.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing            현존하는 파�과 메시지를 합칩니다\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=<파�.po>   <파�.po>� 메시지는 뽑아내지 않습니다\n"
 
 # TAG가 정확� �지?
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3966,23 +3973,23 @@ msgid ""
 "lines\n"
 "                                in output file\n"
 msgstr ""
-"  -c<태그>, --add-comments[=<태그>]  키워드 줄 앞� <태그>로 시작하는 주�\n"
+"  -c<태그>, --add-comments[=태그]    키워드 줄 앞� <태그>로 시작하는 주�\n"
 "                                     부분� 출력 파�� �니다\n"
 "  -c, --add-comments                 키워드 줄 앞� 모든 주� 부분� 출력\n"
 "                                     파�� �니다\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=<�름>          메시지� 대해 문법 검사를 합니다\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3993,17 +4000,17 @@ msgstr ""
 "                                (single-space(공백 1개)가 기본값,\n"
 "                                 아니면 double-space(공백 2개))\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language 관련 옵션:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              모든 문�열� 뽑아 냅니다\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4019,7 +4026,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4035,7 +4042,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4045,7 +4052,7 @@ msgstr ""
 "      --flag=WORD:ARG:FLAG    키워드 WORD� �� 번호 ARG안� 있는 문�열�\n"
 "                              추가 플래그\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4061,66 +4068,71 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs                입력�서 ANSI C 삼중�(trigraph)를 ��합니"
 "다\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (다� 언어만 지�: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=<파�>            <파�>�서 ITS 규칙 �용\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (XML 기반 언어만 지�)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt 형� 문�열� 알아냅니다\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++만 지�)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   KDE 4 형� 문�열� 알아냅니다\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost 형� 문�열� 알아냅니다\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                    � �세한 형�문�열 �� 결과\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     �바 .properties 파�� �니다\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "  -f, --files-from=<파�>     입력 파�� 목�� <파�>�서 �습니다\n"
-
-#: src/xgettext.c:1198
-#, fuzzy, c-format
+#: src/xgettext.c:1188
+#, c-format
 msgid "      --itstool               write out itstool comments\n"
-msgstr "      --indent                들여 쓰기� 출력 스타�\n"
+msgstr "      --itstool               itstool 주� 출력\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=<문�열> 출력할 저작권 소유�를 지정합니다\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4128,17 +4140,17 @@ msgstr ""
 "      --foreign-user             외부 사용�를 위해 FSF 저작권 표시를 �니"
 "다\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=<패키지> 출력�서 패키지 �름� 지정합니다\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=<버전>   출력�서 패키지 버전� 지정합니다\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4146,60 +4158,60 @@ msgstr ""
 "      --msgid-bugs-address=전�메�@주소   msgid 버그를 보고할 주소를 지정합"
 "니다\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -m[<문�열>], --msgstr-prefix[=<문�열>]  msgstr 항목� <문�열> 혹� "
+"  -m[문�열], --msgstr-prefix[=문�열]      msgstr 항목� <문�열> 혹� "
 "\"\"� \n"
 "                                            접�어로 사용합니다\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 "msgstr\n"
 "                                values\n"
 msgstr ""
-"  -M[<문�열>], --msgstr-suffix[=<문�열>]  msgstr 항목� <문�열> 혹� "
+"  -M[문�열], --msgstr-suffix[=문�열]      msgstr 항목� <문�열> 혹� "
 "\"\"� \n"
 "                                            접미어로 사용합니다\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr "--flag� ��가 <keyword>:<argnum>:[pass-]<flag> 문법� 아닙니다: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "표준 입력"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s� ASCII가 아닌 문�열� 있습니다."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s� �는 그 앞� ASCII가 아닌 문�열� 있습니다."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s� 시작하는 ASCII가 아닌 문�열� 있습니다."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 경고: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4208,7 +4220,7 @@ msgstr ""
 "형� 문�열� 위치 지정� 사용했지만, %s�(는) 잘못� %s 형� 문�열입니다. "
 "�유: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4216,7 +4228,7 @@ msgid ""
 msgstr ""
 "선언한 것과는 달리, '%s'�(는) 올바른 %s 형� 문�열� 아닙니다. �유: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4229,7 +4241,7 @@ msgstr ""
 "�름� 있는 ��를 �용해 형� 문�열� 사용해 보십시오.\n"
 "아니면 ��� 대해 튜플 대신� 매핑� 사용해 보십시오.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4239,27 +4251,27 @@ msgstr ""
 "gettext(\"\")는 빈 문�열� 아니�, 메타 정보가 들어 있는 \n"
 "헤� 항목� 리턴합니다.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "'%.*s' 키워드� 대한 �� 지정� 애매합니다"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "경고: '%.*s' 키워드� 대해 컨�스트가 없습니다"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "경고: '%.*s' 키워드� 복수형 ��� 대해 컨�스트가 없습니다"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "단수형과 복수형 사�� 컨�스트가 다릅니다"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4271,7 +4283,7 @@ msgstr ""
 "변수를 지정하십시오. 그렇지 않으면 --msgid-bugs-address\n"
 "명령행 옵션� 사용하십시오.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "'%s' 언어를 알 수 없습니다"
@@ -4381,7 +4393,7 @@ msgstr "%s:%d: 8비트 문� \"%c\"� �터�레�션(\"\\L\")� 잘못�
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8비트 문� \"%c\"� �터�레�션(\"\\U\")� 잘못�었습니다"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4389,7 +4401,7 @@ msgstr ""
 "소스 �코딩� --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페�지� 있는 것처럼 주�으로 지정하십시오.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4400,7 +4412,7 @@ msgstr ""
 "소스 �코딩� --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페�지� 있는 것처럼 주�으로 지정하십시오.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4411,7 +4423,7 @@ msgstr ""
 "소스 �코딩� --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페�지� 있는 것처럼 주�으로 지정하십시오.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4422,7 +4434,7 @@ msgstr ""
 "소스 �코딩� --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페�지� 있는 것처럼 주�으로 지정하십시오.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4433,7 +4445,7 @@ msgstr ""
 "소스 �코딩� --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페�지� 있는 것처럼 주�으로 지정하십시오.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4444,23 +4456,23 @@ msgstr ""
 "소스 �코딩� --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
 "pep-0263.html 페�지� 있는 것처럼 주�으로 지정하십시오.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 "\"%s\" �코딩� 어떤 �코딩�지 알 수 없습니다. 대신 ASCII로 진행합니다."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: 잘못� 문�열 정�"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # 다�� 숫�가 빠졌습니다"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: 잘못� 문�열 표현"
@@ -4484,139 +4496,123 @@ msgid "<unnamed>"
 msgstr "<�름없�>"
 
 #: libgettextpo/markup.c:366 libgettextpo/markup.c:449
-#, fuzzy
 msgid "invalid UTF-8 sequence"
-msgstr "잘못� 제어 시퀀스"
+msgstr "잘못� UTF-8 시퀀스"
 
 #: libgettextpo/markup.c:377
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid name: %c"
-msgstr "올바른 �바 �래스 �름� 아닙니다: %s"
+msgstr "'%s'�(는) 올바른 �름� 아닙니다: %c"
 
 #: libgettextpo/markup.c:397
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid name: '%c'"
-msgstr "올바른 �바 �래스 �름� 아닙니다: %s"
+msgstr "'%s'�(는) 올바른 �름� 아닙니다: '%c'"
 
 #: libgettextpo/markup.c:523 libgettextpo/markup.c:534
 #: libgettextpo/markup.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "invalid character reference: %s"
-msgstr "잘못� 제어 시퀀스"
+msgstr "잘못� 문� 레�런스: %s"
 
 #: libgettextpo/markup.c:526
 msgid "not a valid number specification"
-msgstr ""
+msgstr "올바른 숫� 명세가 아닙니다"
 
 #: libgettextpo/markup.c:535 libgettextpo/markup.c:606
 msgid "no ending ';'"
-msgstr ""
+msgstr "';'으로 �나지 않�"
 
 #: libgettextpo/markup.c:560
 msgid "non-permitted character"
-msgstr ""
+msgstr "허용하지 않는 문�"
 
 #: libgettextpo/markup.c:599
 msgid "empty"
-msgstr ""
+msgstr "비었�"
 
 #: libgettextpo/markup.c:604
 msgid "unknown"
-msgstr ""
+msgstr "알 수 없�"
 
 #: libgettextpo/markup.c:608
-#, fuzzy, c-format
+#, c-format
 msgid "invalid entity reference: %s"
-msgstr "엔디안� 틀렸습니다: %s"
+msgstr "올바르지 않� 엔티티 레�런스: %s"
 
 #: libgettextpo/markup.c:959
 msgid "document must begin with an element"
-msgstr ""
+msgstr "문서는 엘리먼트로 시작해야 합니다"
 
 #: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
 #: libgettextpo/markup.c:1332
-#, fuzzy, c-format
+#, c-format
 msgid "invalid character after '%s'"
-msgstr "`%2$s'� 대한 �� `%1$s'�(가) 잘못�었습니다"
+msgstr "'%s' 뒤� 잘못� 문�"
 
 #: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
 msgid "missing '%c'"
-msgstr ""
+msgstr "'%c' 문� 빠�"
 
 #: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
 msgid "missing '%c' or '%c'"
-msgstr ""
+msgstr "'%c' �는 '%c' 문� 빠�"
 
 #: libgettextpo/markup.c:1333
 msgid "a close element name"
-msgstr ""
+msgstr "닫는 엘리먼트 �름"
 
 #: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
 msgid "element is closed"
-msgstr ""
+msgstr "엘리먼트가 닫힘"
 
 #: libgettextpo/markup.c:1475
 msgid "empty document"
-msgstr ""
+msgstr "빈 문서"
 
 #: libgettextpo/markup.c:1488
 msgid "after '<'"
-msgstr ""
+msgstr "'<' 뒤�"
 
 #: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
 msgid "elements still open"
-msgstr ""
+msgstr "엘리먼트가 아� 열림"
 
 #: libgettextpo/markup.c:1500
 msgid "missing '>'"
-msgstr ""
+msgstr "'>' 빠�"
 
 #: libgettextpo/markup.c:1504
 msgid "inside an element name"
-msgstr ""
+msgstr "엘리먼트 �름 안�"
 
 #: libgettextpo/markup.c:1509
-#, fuzzy
 msgid "inside an attribute name"
-msgstr "필터 �름� 빠졌습니다"
+msgstr "�성 �름 안�"
 
 #: libgettextpo/markup.c:1513
 msgid "inside an open tag"
-msgstr ""
+msgstr "여는 태그 안�"
 
 #: libgettextpo/markup.c:1517
 msgid "after '='"
-msgstr ""
+msgstr "'=' 뒤�"
 
 #: libgettextpo/markup.c:1522
 msgid "inside an attribute value"
-msgstr ""
+msgstr "�성 값 안�"
 
 #: libgettextpo/markup.c:1533
 msgid "inside the close tag"
-msgstr ""
+msgstr "닫는 태그 안�"
 
 #: libgettextpo/markup.c:1537
 msgid "inside a comment or processing instruction"
-msgstr ""
+msgstr "주� �는 처리 지시� 안�"
 
 #: libgettextpo/markup.c:1548
 #, c-format
 msgid "document ended unexpectedly: %s"
-msgstr ""
-
-# XML 엘리먼트를 �한다
-#~ msgid "Missing context for the string extracted from '%s' element"
-#~ msgstr "'%s' 엘리먼트�서 뽑아낸 문�열� 대한 컨�스트가 없습니다"
-
-#~ msgid "%s:%lu:%lu: %s"
-#~ msgstr "%s:%lu:%lu: %s"
-
-#~ msgid ""
-#~ "Language \"glade\" is not supported. %s relies on expat.\n"
-#~ "This version was built without expat.\n"
-#~ msgstr ""
-#~ "언어 \"glade\"는 지��지 않습니다. %s�(는) expat� �존합니다.\n"
-#~ "� 버전� expat 없� 빌드�었습니다.\n"
+msgstr "문서가 예기치 않게 �남: %s"
diff --git a/gettext-tools/po/nb.gmo b/gettext-tools/po/nb.gmo
index 02e81f6..a7ebbb3 100644
--- a/gettext-tools/po/nb.gmo
+++ b/gettext-tools/po/nb.gmo
diff --git a/gettext-tools/po/nb.po b/gettext-tools/po/nb.po
index feb62b3..f51425a 100644
--- a/gettext-tools/po/nb.po
+++ b/gettext-tools/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2001-05-09 02:08+02:00\n"
 "Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
 "Language-Team: Norwegian-bokmål <no@li.org>\n"
@@ -107,7 +107,7 @@ msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -185,15 +185,15 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -216,39 +216,39 @@ msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -287,18 +287,18 @@ msgstr ""
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "kan ikke opprette utfilen «%s»"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan ikke opprette utfilen «%s»"
@@ -330,11 +330,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
@@ -354,7 +354,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -367,21 +367,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr ""
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -391,21 +391,21 @@ msgstr ""
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -415,10 +415,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet av %s.\n"
@@ -449,37 +449,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "feil under åpning av «%s» for lesing"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -513,8 +513,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
@@ -803,8 +802,8 @@ msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
@@ -821,57 +820,57 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -919,7 +918,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -964,11 +963,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
@@ -1040,12 +1039,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "trenger nøyaktig to innfiler"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker hverandre"
@@ -1062,7 +1061,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1071,10 +1070,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "ingen innfil angitt"
@@ -1084,10 +1083,10 @@ msgstr "ingen innfil angitt"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1099,23 +1098,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1124,7 +1123,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -1229,9 +1228,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1252,17 +1251,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1271,87 +1270,87 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1370,31 +1369,31 @@ msgstr ""
 "  -V, --version            skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL       sett sidebredden i utdata\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1424,51 +1423,51 @@ msgstr ""
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1476,26 +1475,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1604,19 +1603,19 @@ msgstr "denne meldingen er brukt, men ikke definert i %s"
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldingen er ikke brukt"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fant %d fatale feil"
 msgstr[1] "fant %d fatale feil"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "minst to filer må angis"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1645,14 +1644,14 @@ msgstr ""
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1697,7 +1696,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "ingen innfil angitt"
@@ -1859,206 +1858,206 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "filen «%s» inneholder en ikke-NUL-terminert streng"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s og %s utelukker hverandre"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "kan ikke opprette utfilen «%s»"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversatt melding"
 msgstr[1] "%d oversatte meldinger"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d antatt oversettelse"
 msgstr[1] ", %d antatte oversettelser"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversatt melding"
 msgstr[1] ", %d uoversatte meldinger"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2067,65 +2066,65 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2133,27 +2132,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2161,33 +2160,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2195,18 +2194,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2215,95 +2214,95 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Tegnsettet mangler i headeren.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenavnet «%s» passer ikke som filnavn"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenavnet «%s» passer ikke som filnavn: bruker prefiks"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "nøkkelord «domain %s» ignorert"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "tom «msgstr»-linje ignorert"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "antatt «msgstr»-linje ignorert"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av «%s»"
@@ -2482,12 +2481,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2505,14 +2504,14 @@ msgid ""
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: advarsel: "
@@ -2581,167 +2580,172 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgid_plural»-innslagene begynner ikke med `\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr[%u]»-innslagene begynner ikke med `\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-innslagene begynner ikke med `\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-innslagene slutter ikke med `\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "filhodefelt «%s» mangler i filhode"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under åpning av «%s» for lesing"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2750,15 +2754,15 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
 "og iconv() støtter ikke \"%s\".\n"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3153,7 +3157,7 @@ msgstr "slutt-på-linje inne i streng"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne filen kan ikke inneholde domene-direktiver"
@@ -3175,32 +3179,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "mangler argumenter"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "filen «%s» er avkuttet"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "filen «%s» inneholder en ikke-NUL-terminert streng"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "filen «%s» er ikke i GNU .mo-format"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "filen «%s» inneholder en ikke-NUL-terminert streng"
@@ -3372,23 +3376,23 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under åpning av «%s» for skriving"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3473,12 +3477,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
@@ -3498,7 +3502,7 @@ msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3530,7 +3534,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3542,7 +3546,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
@@ -3562,77 +3566,77 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "språket «%s» er ukjent"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikke brukes når utdata blir skrevet til standard ut"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbeide uten å finne nøkkelord"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "advarsel: typen til fil «%s» med utvidelsen «%s» er ukjent, forsøker C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "ingen innfil angitt"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3645,41 +3649,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3689,15 +3693,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3705,17 +3709,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3725,7 +3729,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3735,7 +3739,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3743,7 +3747,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3753,85 +3757,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3839,7 +3848,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3847,52 +3856,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standard inn"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: advarsel: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3901,34 +3910,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3936,7 +3945,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "språket «%s» er ukjent"
@@ -4035,13 +4044,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4049,7 +4058,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4057,7 +4066,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4065,7 +4074,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4073,7 +4082,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4081,22 +4090,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
diff --git a/gettext-tools/po/nl.gmo b/gettext-tools/po/nl.gmo
index 1bd6028..6a619d5 100644
--- a/gettext-tools/po/nl.gmo
+++ b/gettext-tools/po/nl.gmo
diff --git a/gettext-tools/po/nl.po b/gettext-tools/po/nl.po
index befe9b0..f8b86fb 100644
--- a/gettext-tools/po/nl.po
+++ b/gettext-tools/po/nl.po
@@ -1,17 +1,17 @@
 # Dutch translations for gettext-tools.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 #
 # "Voor de wind."
 #
 # Erick Branderhorst <Erick.Branderhorst@asml.nl>, 1996.
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008, 2014, 2015.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools-0.19.6.43\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-12 13:55+0100\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-05-30 21:52+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -112,7 +112,7 @@ msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -190,15 +190,15 @@ msgstr "ongeldige waarde voor 'source_version' in compile_java_class()"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ongeldige waarde voor 'target_version' in compile_java_class()"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "aanmaken van '%s' is mislukt"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -221,39 +221,39 @@ msgid "%s subprocess I/O error"
 msgstr "In-/uitvoerfout in subproces %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "aanmaken van threads is mislukt"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "schrijven naar subproces %s is mislukt"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "lezen uit subproces %s is mislukt"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "kan geen niet-blokkerende in-/uitvoer instellen naar subproces %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "communicatie met subproces %s is mislukt"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "subproces %s is geëindigd met afsluitwaarde %d"
@@ -292,18 +292,18 @@ msgstr "’"
 msgid "setting permissions for %s"
 msgstr "instellen van toegangsrechten van %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "kan geen pijp aanmaken"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle() is mislukt"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt"
@@ -335,11 +335,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
@@ -365,7 +365,7 @@ msgstr ""
 "gettext.  Als er geen argumenten gegeven zijn, dan worden de meervoudsregels\n"
 "van standaardinvoer gelezen.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -380,21 +380,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr          meervoudsregels weergeven in CLDR-opmaak\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help          deze hulptekst tonen en stoppen\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version       programmaversie tonen en stoppen\n"
@@ -404,22 +404,22 @@ msgstr "  -V, --version       programmaversie tonen en stoppen\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapporteer gebreken in het programma aan <bug-gnu-gettext@gnu.org>;\n"
 "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -434,10 +434,10 @@ msgstr ""
 "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
@@ -468,37 +468,37 @@ msgid "extra operand %s"
 msgstr "overtollige operand: %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fout bij openen van '%s' voor lezen"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "een opmaakcode voor argument %u, als in '%s', komt niet voor in '%s'"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "een opmaakcode voor argument %u komt niet voor in '%s'"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -537,8 +537,7 @@ msgstr ""
 "De tekenreeks verwijst naar argumentnummer %u maar negeert argumentnummer %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "het aantal opmaakcodes in '%s' en '%s' is niet gelijk"
@@ -869,8 +868,8 @@ msgstr "de opmaakcodes in '%s' en '%s' zijn niet gelijkwaardig"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "de opmaakcodes in '%s' zijn geen subset van die in '%s'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "opmaakcode voor argument '%s' komt niet voor in '%s'"
@@ -889,29 +888,29 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "In directief nummer %u kan '%c' geen veldnaam beginnen."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "In directief nummer %u kan '%c' geen 'getattr'-argument beginnen."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "In directief nummer %u kan '%c' geen 'getitem'-argument beginnen."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 "In directief nummer %u is geen nesting meer toegestaan in een opmaakcode."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "In directief nummer %u is er een onafgemaakte opmaakcode."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -919,34 +918,34 @@ msgstr ""
 "De tekenreeks verwijst naar argumenten zowel via argumentnamen als via "
 "onbenoemde argumentspecificaties."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "De tekenreeks verwijst naar het argument genaamd '%s' op niet-compatibele "
 "wijze."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "de opmaakcodes in '%s' verwachten een afbeelding, die in '%s' een tupel"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "de opmaakcodes in '%s' verwachten een tupel, die in '%s' een afbeelding"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "opmaakcode voor argument '%s', als in '%s', komt niet voor in '%s'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1003,7 +1002,7 @@ msgstr ""
 "Het teken waarmee directief nummer %u afsluit is geen cijfer tussen 1 en 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1048,11 +1047,11 @@ msgstr "  -f, --fqdn, --long          lange hostnaam: FQDN plus aliassen\n"
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            IP-adressen behorend bij de hostnaam\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatieve uitvoer:\n"
@@ -1124,12 +1123,12 @@ msgstr "het hoofdelement is niet \"locatingRules\""
 msgid "at most one input file allowed"
 msgstr "hoogstens één invoerbestand is toegestaan"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s en %s sluiten elkaar uit"
@@ -1148,7 +1147,7 @@ msgstr ""
 "Filtert de berichten van een vertalingenbestand aan de hand van hun\n"
 "eigenschappen, en manipuleert die eigenschappen.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1158,10 +1157,10 @@ msgid ""
 msgstr ""
 "Een verplicht argument bij een lange optie geldt ook voor de korte vorm.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Locatie van invoerbestand:\n"
@@ -1171,10 +1170,10 @@ msgstr "Locatie van invoerbestand:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INVOERBESTAND               in te lezen PO-bestand\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1189,24 +1188,24 @@ msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Zonder invoerbestand, of als deze '-' is, wordt standaardinvoer gelezen.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Locatie van uitvoerbestand:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=BESTAND   de uitvoer naar gegeven bestand schrijven\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1218,7 +1217,7 @@ msgstr ""
 "uitvoerbestand\n"
 "gegeven is of als deze '-' is.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Berichtenselectie:\n"
@@ -1345,9 +1344,9 @@ msgstr ""
 "      --obsolete              hetzelfde als '--only-obsolete --clear-"
 "obsolete'\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1368,17 +1367,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Uitvoerdetails:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1387,118 +1386,118 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "onmogelijke selectiecriteria opgegeven (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1512,51 +1511,51 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INVOERBESTAND...            invoerbestanden\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Als invoerbestand '-' is, dan wordt standaardinvoer gelezen.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1564,26 +1563,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1612,7 +1611,7 @@ msgid ""
 "you have translated each and every message in your program.  Where an exact\n"
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
-"Twee PO-bestaden in Uniforum-stijl vergelijken en controleren dat beide\n"
+"Vergelijkt twee PO-bestaden in Uniforum-stijl en controleert dat beide\n"
 "dezelfde set msgid's bevatten.  Het bestand 'bestaande.po' is een bestaand\n"
 "PO-bestand met oude vertalingen; het bestand 'referentie.pot' is het laatst\n"
 "aangemaakte PO-bestand, of een een POT-bestand (gewoonlijk aangemaakt door\n"
@@ -1687,19 +1686,19 @@ msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd in %s"
 msgid "warning: this message is not used"
 msgstr "waarschuwing: dit bericht wordt niet gebruikt"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d fatale fout gevonden"
 msgstr[1] "%d fatale fouten gevonden"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "er moeten minstens twee bestanden opgegeven worden"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1712,14 +1711,14 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1764,7 +1763,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "geen invoerbestand gegeven"
@@ -1928,208 +1927,208 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "filteruitvoer wordt niet door een regeleindeteken afgesloten"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "het argument van %s dient één enkel interpunctieteken te zijn"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ongeldige endian-waarde: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 "er hoort geen invoerbestand gegeven te zijn wanneer %s en %s gegeven zijn"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s vereist een optie \"-d MAP\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s vereist een optie \"-l TAALREGIO\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s vereist een optie \"--template SJABLOON\""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s vereist een optie \"-o BESTAND\""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s en %s sluiten elkaar uit in %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s is alleen geldig samen met %s of %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s is alleen geldig samen met %s, %s of %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "kan ITS-regels voor %s niet vinden"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d vertaald bericht"
 msgstr[1] "%d vertaalde berichten"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d vage gelijkenis"
 msgstr[1] ", %d vage gelijkenissen"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d onvertaald bericht"
 msgstr[1] ", %d onvertaalde berichten"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Gebruik:  %s [OPTIE] bestandsnaam.po...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Genereert een binaire berichtencatalogus uit een vertalingenbestand.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  bestandsnaam.po...          invoerbestanden\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Werkingsmodus:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Als het uitvoerbestand '-' is, dan wordt naar standaarduitvoer geschreven.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Locatie van uitvoerbestand in Java-modus:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2138,65 +2137,65 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Locatie van uitvoerbestand in C#-modus:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Locatie van uitvoerbestand in Tcl-modus:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2204,27 +2203,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2232,33 +2231,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2266,18 +2265,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2286,91 +2285,91 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "waarschuwing: PO-kopregels ontbreken of zijn ongeldig\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "waarschuwing: tekensetconversie zal niet werken\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "waarschuwing: PO-kopregels zijn gemarkeerd als 'fuzzy'\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "waarschuwing: oudere versies van 'msgfmt' vinden dit een fout\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeinnaam '%s' is niet bruikbaar als bestandsnaam"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "domeinnaam '%s' is niet bruikbaar als bestandsnaam: voorvoegsel wordt "
 "gebruikt"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "directief 'domain %s' is genegeerd"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "leeg 'msgstr'-item is genegeerd"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "fuzzy 'msgstr'-item is genegeerd"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: waarschuwing: bronbestand bevat fuzzy vertaling"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s bestaat niet"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s bestaat maar kan deze niet lezen"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fout tijdens lezen van '%s'"
@@ -2551,12 +2550,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Nederlandse vertalingen voor het pakket %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "huidige tekensetnaam '%s' is geen overdraagbare coderingsnaam"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2576,14 +2575,14 @@ msgstr ""
 "domein '%s' in invoerbestand '%s' bevat geen kopregel met een "
 "tekensetspecificatie"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "doeltekenset '%s' is geen overdraagbare codering"
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "waarschuwing: "
@@ -2655,176 +2654,181 @@ msgstr ""
 "coderingsnaam.  De uitvoer van '%s' zou onjuist kunnen zijn.\n"
 "Het zetten van LC_ALL=C kan dit eventueel vermijden.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ongeldige waarde van 'nplurals'"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ongeldige meervoudsexpressie"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "aantal meervouden = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "maar sommige berichten hebben slechts één meervoudsvorm"
 msgstr[1] "maar sommige berichten hebben slechts %lu meervoudsvormen"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "maar sommige berichten hebben één meervoudsvorm"
 msgstr[1] "maar sommige berichten hebben %lu meervoudsvormen"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid' en 'msgid_plural' beginnen niet beide met '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "'msgid' en 'msgstr[%u]' beginnen niet beide met '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "'msgid' en 'msgstr' beginnen niet beide met '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "'msgid' en 'msgid_plural' eindigen niet beide met '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "'msgid' en 'msgstr[%u]' eindigen niet beide met '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "'msgid' en 'msgstr' eindigen niet beide met '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "meervoudsvormen zijn een uitbreiding van GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "sneltoetsmarkering '%c' ontbreekt in 'msgstr'"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "'msgstr' bevat te veel '%c'-sneltoetsmarkeringen"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "kopveld '%s' heeft nog de standaardwaarde\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "kopveld '%s' ontbreekt in PO-kopregels\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: invoer is ongeldig in codering '%s'"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: fout tijdens omzetten van codering '%s' naar '%s'"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "invoerbestand bevat geen kopregel met een tekensetspecificatie"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3215,7 +3219,7 @@ msgstr "regeleindeteken IN een tekenreeks"
 msgid "context separator <EOT> within string"
 msgstr "tekstscheidingteken <EOT> IN een tekenreeks"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "dit bestand mag geen domeindirectieven bevatten"
@@ -3237,33 +3241,33 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr "waarschuwing: ongeldig Unicode-teken"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "ontbrekende filternaam"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "ongeldige waarde van 'nplurals'"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "bestand '%s' is afgekapt"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr ""
 "bestand '%s' bevat een tekenreeks die niet door NUL-teken wordt afgesloten"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "bestand '%s' is geen GNU .mo-bestand"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
@@ -3431,23 +3435,23 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fout bij openen van '%s' voor schrijven"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3532,12 +3536,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: waarschuwing: onafgesloten reguliere expressie"
@@ -3557,7 +3561,7 @@ msgstr "%s:%d: waarschuwing: onafgesloten tekenconstante"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3589,7 +3593,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3601,7 +3605,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: waarschuwing: ongeldig Unicode-teken"
@@ -3621,80 +3625,80 @@ msgstr "%s:%d: waarschuwing: ')' gevonden waar '}' werd verwacht"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: waarschuwing: '}' gevonden waar ')' werd verwacht"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
-#, fuzzy, c-format
+#: src/xgettext.c:651
+#, c-format
 msgid "syntax check '%s' unknown"
-msgstr "taal '%s' is onbekend"
+msgstr "syntaxcontrole '%s' is onbekend"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "'--join-existing' kan niet gebruikt worden wanneer naar standaarduitvoer "
 "geschreven wordt"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "waarschuwing: onbekende extensie '%2$s' van bestand '%1$s'; C wordt "
 "aangenomen"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extraheert vertaalbare berichten uit de gegeven invoerbestanden.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3707,41 +3711,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3751,15 +3755,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3767,17 +3771,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3787,7 +3791,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3797,7 +3801,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3805,7 +3809,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3815,85 +3819,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "  bestaande.po                bestaand bestand met vertalingen\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
+#: src/xgettext.c:1188
 #, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
-#, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
-msgstr "  -s, --short                 korte hostnaam\n"
+msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3901,7 +3910,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3909,52 +3918,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standaardinvoer"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: waarschuwing: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3963,34 +3972,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3998,7 +4007,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "taal '%s' is onbekend"
@@ -4097,13 +4106,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4111,7 +4120,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4119,7 +4128,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4127,7 +4136,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4135,7 +4144,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4143,22 +4152,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Onbekende codering '%s'.  Verdergegaan met ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ongeldige definitie van tekenreeks"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: ontbrekend getal na #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ongeldige tekenreeksexpressie"
@@ -4201,7 +4210,7 @@ msgstr "ongeldige tekenreferentie: %s"
 
 #: libgettextpo/markup.c:526
 msgid "not a valid number specification"
-msgstr ""
+msgstr "geen geldige nummerspecificatie"
 
 #: libgettextpo/markup.c:535 libgettextpo/markup.c:606
 msgid "no ending ';'"
diff --git a/gettext-tools/po/nn.gmo b/gettext-tools/po/nn.gmo
index 3bbd91a..44e21bc 100644
--- a/gettext-tools/po/nn.gmo
+++ b/gettext-tools/po/nn.gmo
diff --git a/gettext-tools/po/nn.po b/gettext-tools/po/nn.po
index d19af73..1c20078 100644
--- a/gettext-tools/po/nn.po
+++ b/gettext-tools/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2009-06-17 22:37+0200\n"
 "Last-Translator: Eirik U. Birkeland <eirbir@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -110,7 +110,7 @@ msgid "Unknown system error"
 msgstr "Ukjend systemfeil"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -188,15 +188,15 @@ msgstr "Ugyldig «source_version»-argument til «compile_java_class»"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "Ugyldig «target_version»-argument til «compile_java_class»"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Klarte ikkje oppretta «%s»"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -223,39 +223,39 @@ msgid "%s subprocess I/O error"
 msgstr "Inn/ut-feil i underprosessen %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "Tomt for minne"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -294,18 +294,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "Klarer ikkje oppretta røyr"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "«_open_osfhandle» mislukkast"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan ikkje opprette utfila \"%s\""
@@ -337,11 +337,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon.\n"
@@ -361,7 +361,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -374,21 +374,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr ""
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -398,20 +398,20 @@ msgstr ""
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -425,10 +425,10 @@ msgstr ""
 "Det er INGEN GARANTI for dette produktet utover det som står i lova.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrive av %s.\n"
@@ -459,18 +459,18 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "Feil ved opning av fila «%s» for lesing"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -479,19 +479,19 @@ msgstr ""
 "«msgid»"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "Ein formatspesifikasjon for argumentet %u finst ikkje i «%s»"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -534,8 +534,7 @@ msgstr ""
 "%u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -865,8 +864,8 @@ msgstr "Formatspesifikasjonane i «msgid» og «%s» er ikkje like"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "Formatspesifikasjonane i «%s» er ikkje ein del av dei i «msgid»"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "Ein formatspesifikasjon for argument «%s» finst ikkje i «%s»"
@@ -885,28 +884,28 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "I direktivnummer %u er ikkje «%c» etterfølgt av eit tal."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "I direktivnummer %u er ikkje «{» etterfølgt av eit argumentnummer."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "I direktivnummer %u er ikkje «%c» etterfølgt av eit tal."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "I direktivnummer %u er det ikkje lov med ei presisering før «%c»."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, fuzzy, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "I direktivnummer %u er argumentet «%d» negativt."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -914,12 +913,12 @@ msgstr ""
 "Strengen viser til argument både gjennom argumentnamn og gjennom namnlause "
 "argumentspesifikasjonar."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -927,7 +926,7 @@ msgstr ""
 "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje "
 "overeins"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -935,13 +934,13 @@ msgstr ""
 "antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje "
 "overeins"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -989,7 +988,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1034,11 +1033,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
@@ -1110,12 +1109,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr ""
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
@@ -1132,7 +1131,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1141,10 +1140,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "inga innfil spesifisert"
@@ -1154,10 +1153,10 @@ msgstr "inga innfil spesifisert"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1169,23 +1168,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1194,7 +1193,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -1299,9 +1298,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1322,17 +1321,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1341,118 +1340,118 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1466,51 +1465,51 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1518,26 +1517,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1645,19 +1644,19 @@ msgstr "denne meldinga er brukt, men ikkje definert i %s"
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fann %d fatale feil"
 msgstr[1] "fann %d fatale feil"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1670,14 +1669,14 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1722,7 +1721,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "inga innfil spesifisert"
@@ -1884,206 +1883,206 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "kan ikkje opprette utfila \"%s\""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2092,65 +2091,65 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2158,27 +2157,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2186,33 +2185,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2220,18 +2219,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2240,89 +2239,89 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn: brukar prefiks"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
@@ -2501,12 +2500,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2524,14 +2523,14 @@ msgid ""
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2600,180 +2599,185 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "nokre filhovud-felt har framleis sin initielle verdi"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "filhovud-feltet «%s» manglar i filhovud"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3156,7 +3160,7 @@ msgstr ""
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
@@ -3178,31 +3182,31 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "manglar argument"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr ""
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "filen \"%s\" er avkutta"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
@@ -3368,23 +3372,23 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, fuzzy, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3468,12 +3472,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
@@ -3493,7 +3497,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3525,7 +3529,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3537,7 +3541,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3557,77 +3561,77 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3640,41 +3644,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3684,15 +3688,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3700,17 +3704,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3720,7 +3724,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3730,7 +3734,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3738,7 +3742,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3748,85 +3752,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3834,7 +3843,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3842,52 +3851,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3896,34 +3905,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3931,7 +3940,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr ""
@@ -4030,13 +4039,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4044,7 +4053,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4052,7 +4061,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4060,7 +4069,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4068,7 +4077,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4076,22 +4085,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
diff --git a/gettext-tools/po/pa.gmo b/gettext-tools/po/pa.gmo
index 94de39a..7c36f34 100644
--- a/gettext-tools/po/pa.gmo
+++ b/gettext-tools/po/pa.gmo
diff --git a/gettext-tools/po/pa.po b/gettext-tools/po/pa.po
index 0dc0d4b..85372f3 100644
--- a/gettext-tools/po/pa.po
+++ b/gettext-tools/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2012-05-21 20:08+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sourceforge.net>\n"
@@ -109,7 +109,7 @@ msgid "Unknown system error"
 msgstr "ਅਣਜਾਣ ਸਿਸਟਮ ਗਲਤੀ"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -187,15 +187,15 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" ਬਣਾਉਣ ਲਈ ਫੇਲ�ਹ ਹੈ"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -218,39 +218,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s ਸਬ-ਪ�ਰੋਸੈਸ I/O ਗਲਤੀ"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "ਮੈਮੋਰੀ ਖਤਮ ਹੋਈ"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ�ਹ"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, fuzzy, c-format
 msgid "read from %s subprocess failed"
 msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ�ਹ"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, fuzzy, c-format
 msgid "communication with %s subprocess failed"
 msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ�ਹ"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -289,18 +289,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "ਪਾਈਪ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle ਫੇਲ�ਹ ਹੈ"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "fd %d ਰੀਸਟੋਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: dup2 ਫੇਲ�ਹ ਹੈ"
@@ -332,11 +332,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ `%s --help' ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ।\n"
@@ -356,7 +356,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -369,21 +369,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  ਇਹ ਮੱਦਦ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ਇਹ ਮੱਦਦ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               ਆਉਟਪ�ੱਟ ਵਰਜਨ ਜਾਣਕਾਰੀ ਅਤੇ ਬੰਦ ਕਰੋ\n"
@@ -393,20 +393,20 @@ msgstr "  -V, --version               ਆਉਟਪà©�ੱਟ ਵਰਜਨ ਜਾà
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "ਬੱਗ ਬਾਰੇ ਜਾਣਕਾਰੀ <bug-gnu-gettext@gnu.org> ਨੂੰ ਭੇਜੋ।\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -420,10 +420,10 @@ msgstr ""
 "ਕੋਈ ਵੀ ਵਾਰੰਟੀ ਨਹੀਂ ਹੈ, ਕਾਨੂੰਨ ਰਾਹੀਂ ਵੱਧ ਵੱਧ ਮਨਜ਼ੂਰੀ ਮ�ਤਾਬਕ।\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s ਵਲੋਂ ਲਿਖਿਆ।\n"
@@ -454,37 +454,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "ਪੜ�ਹਨ ਵਾਸਤੇ \"%s\" ਖੋਲ�ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr ""
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -518,8 +518,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -808,8 +807,8 @@ msgstr ""
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
@@ -826,57 +825,57 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -924,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -969,11 +968,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ਹੋਸਟ-ਨਾਂ ਲਈ �ਡਰੈਸ\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "ਜਾਣਕਾਰੀ ਸਮੇਤ ਆਉਟਪ�ੱਟ:\n"
@@ -1045,12 +1044,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਇੱਕ ਇੰਪ�ੱਟ ਫਾਇਲ ਮਨਜ਼ੂਰ ਹੈ"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
@@ -1067,7 +1066,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1076,10 +1075,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "ਇੰਪ�ੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
@@ -1089,10 +1088,10 @@ msgstr "ਇੰਪ�ੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   ਇੰਪ�ੱਟ PO ਫਾਇਲ\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1104,23 +1103,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "ਆਉਟਪ�ੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      ਆਉਟਪ�ੱਟ ਦਿੱਤੀ ਫਾਇਲ ਵਿੱਚ ਲਿਖੋ\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1129,7 +1128,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "ਸ�ਨੇਹਾ ਚੋਣ:\n"
@@ -1234,9 +1233,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1257,17 +1256,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "ਆਉਟਪ�ੱਟ ਵੇਰਵਾ:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1276,118 +1275,118 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1401,51 +1400,51 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               ਇੰਪ�ੱਟ ਫਾਇਲਾਂ\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       ਫਾਇਲ (FILE) ਤੋਂ ਇੰਪ�ੱਟ ਫਾਇਲਾਂ ਦੀ ਸੂਚੀ ਲਵੋ\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1453,26 +1452,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "ਪੀਟਰ ਮਿੱਲਰ"
 
@@ -1569,19 +1568,19 @@ msgstr "ਇਹ ਸà©�ਨੇਹਾ ਵਰਤਿਆ ਤਾਂ ਗਿਆ ਹੈ, à¨
 msgid "warning: this message is not used"
 msgstr "ਸਾਵਧਾਨ: ਇਹ ਸ�ਨੇਹਾ ਵਰਤਿਆ ਨਹੀਂ ਗਿਆ ਹੈ"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d ਘਾਤਕ ਗਲਤੀ ਲੱਭੀ"
 msgstr[1] "%d ਘਾਤਕ ਗਲਤੀਆਂ ਲੱਭੀਆਂ"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "ਘੱਟੋ-ਘੱਟ ਦੋ ਫਾਇਲਾਂ ਦੇਣ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1594,14 +1593,14 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1646,7 +1645,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "ਕੋਈ ਇੰਪ�ੱਟ ਫਾਇਲ ਨਹੀਂ ਦਿੱਤੀ"
@@ -1808,206 +1807,206 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr ""
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ਗਲਤ ਅੰਤ(endianness): %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "ਉਲਰਿਚ ਡਰਿੱਪਰ"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s ਲਈ ਇੱਕ \"-d directory\" ਦੇਣ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, fuzzy, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, fuzzy, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr ""
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s ਕੇਵਲ %s ਜਾਂ %s ਲਈ ਹੀ ਢ�ੱਕਵਾਂ ਹੈ"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "ਆਉਟਪ�ੱਟ ਫਾਇਲ \"%s\" ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ਅਨ�ਵਾਦ ਕੀਤਾ ਸ�ਨੇਹਾ"
 msgstr[1] "%d ਅਨ�ਵਾਦ ਕੀਤੇ ਸ�ਨੇਹੇ"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ਅਸਪਸ਼ਟ ਅਨ�ਵਾਦ"
 msgstr[1] ", %d ਅਸਪਸ਼ਟ ਅਨ�ਵਾਦ"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d ਨਾ-ਅਨ�ਵਾਦ ਸ�ਨੇਹਾ"
 msgstr[1] ", %d ਨਾ-ਅਨ�ਵਾਦ ਸ�ਨੇਹੇ"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] ਫਾਇਲ-ਨਾਂ.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "ਟੈਕਸਟ ਅਨ�ਵਾਦ ਵੇਰਵੇ ਤੋਂ ਬਾਈਨਰੀ ਸ�ਨੇਹਾ ਕੈਟਾਲਾਗ ਤਿਆਰ ਕਰੋ।\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ਇੰਪ�ੱਟ ਫਾਇਲ ਨਾਂ\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "ਓਪਰੇਸ਼ਨ ਮੋਡ:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "  FILE ...                    ਇੰਪ�ੱਟ .mo ਫਾਇਲਾਂ\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "ਜਾਵਾ ਮੋਡ ਵਿੱਚ ਆਉਟਪ�ੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     ਸਰੋਤ ਨਾਂ\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr "  -l, --locale=LOCALE         ਲੋਕੇਲ ਨਾਂ, ਜਾਂ ਭਾਸ਼ਾ ਨਾਂ ਜਾਂ ਭਾਸ਼ਾ_ਦੇਸ਼ \n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d DIRECTORY                ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2016,65 +2015,65 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# ਮੋਡ ਵਿੱਚ ਆਉਟਪ�ੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl ਮੋਡ ਵਿੱਚ ਆਉਟਪ�ੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, fuzzy, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORY                ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2082,27 +2081,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "ਇੰਪ�ੱਟ ਫਾਇਲ ਇੰਟਰਪਰੇਟੇਸ਼ਨ:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2110,33 +2109,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2144,18 +2143,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             ਆਉਟਪ�ੱਟ ਵਿੱਚ ਅਸਪਸ਼ਟ (fuzzy) �ਂਟਰੀਆਂ ਵਰਤੋਂ\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2164,89 +2163,89 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            ਅਨ�ਵਾਦ ਬਾਰੇ ਅੰਕੜੇ ਪੇਸ਼ ਕਰੋ\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਗ�ੰਮ ਹੈ ਜਾਂ ਗਲਤ ਹੈ\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "ਸਾਵਧਾਨ: charset ਬਦਲਣਾ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਅਸਪਸ਼ਟ ਹੈ\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "ਸਾਵਧਾਨ: msgfmt ਦਾ ਪ�ਰਾਣਾ ਵਰਜਨ ਇਸ ਉੱਤੇ ਗਲਤੀ ਦੇਵੇਗਾ\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ਡੋਮੇਨ ਨਾਂ \"%s\" ਫਾਇਲ ਨਾਂ ਲਈ ਢ�ੱਕਵਾਂ ਨਹੀਂ ਹੈ"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "ਖਾਲੀ `msgstr' �ਂਟਰੀ ਅਣ-ਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ਅਸਪਸ਼ਟ `msgstr' �ਂਟਰੀ ਅਣਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ਸਾਵਧਾਨ: ਸਰੋਤ ਫਾਇਲ ਵਿੱਚ ਅਸਪਸ਼ਟ ਅਨ�ਵਾਦ ਹੋ ਸਕਦਾ ਹੈ"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ਪੜ�ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
@@ -2434,12 +2433,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s ਪੈਕੇਜ ਲਈ ਅੰਗਰੇਜ਼ੀ ਅਨ�ਵਾਦ"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "ਇੰਪ�ੱਟ ਫਾਇਲ ਵਿੱਚ ਦੋ ਵੱਖ ਵੱਖ charsets \"%s\" ਅਤੇ \"%s\""
@@ -2457,14 +2456,14 @@ msgid ""
 "charset specification"
 msgstr "ਇੰਪ�ੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ �ਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "ਸਾਵਧਾਨ: "
@@ -2539,180 +2538,185 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "ਅੱਗੇ ਦਿੱਤੇ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਸਿਸ਼ ਕਰੋ, %s ਲਈ ਠੀਕ:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "ਸ�ਨੇਹਾ ਕੈਟਾਲਾਗ ਵਿੱਚ ਬਹ�ਵਚਨ ਰੂਪ ਵਿੱਚ ਅਨ�ਵਾਦ ਹੈ"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ਪਰ ਹੈੱਡਰ �ਂਟਰੀ ਵਿੱਚ \"plural=EXPRESSION\" ਗ�ਣ ਨਹੀਂ ਹੈ"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ਗਲਤ nplurals ਮ�ੱਲ"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ਗਲਤ ਬਹ�ਵਚਨ ਸਮੀਕਰਨ"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "ਪਰ ਕ�� ਸ�ਨੇਹਿਆਂ ਵਿੱਚ ਕੇਵਲ ਇੱਕ ਬਹ�ਵਚਨ ਰੂਪ ਹੈ"
 msgstr[1] "ਪਰ ਕ�� ਸ�ਨੇਹਿਆਂ ਵਿੱਚ ਕੇਵਲ %lu ਬਹ�ਵਚਨ ਰੂਪ ਹਨ"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgid_plural' �ਂਟਰੀਾਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼�ਰੂ ਨਹੀਂ ਹ�ੰਦੀਆਂ"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' �ਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼�ਰੂ ਨਹੀਂ ਹ�ੰਦੀਆਂ ਹਨ"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' �ਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼�ਰੂ ਨਹੀਂ ਹ�ੰਦੀਆਂ ਹਨ"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' and `msgid_plural' �ਂਟਰੀਾਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼�ਰੂ ਨਹੀਂ ਹ�ੰਦੀਆਂ"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' �ਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼�ਰੂ ਨਹੀਂ ਹ�ੰਦੀਆਂ ਹਨ"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' �ਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼�ਰੂ ਨਹੀਂ ਹ�ੰਦੀਆਂ ਹਨ"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "ਬਹ�ਵਚਨ ਹੈਡਲਿੰਗ ਗਨੂ gettext ਇਕਸਟੈਨਸ਼ਨ ਹੈ"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr ਵਿੱਚ ਕੀਬੋਰਡ �ਕਸਰਲੇਟਰ ਮਾਰਕ '%c' ਦੀ ਕਮੀ ਹੈ"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਹਾਲੇ ਵੀ ਮ�ੱਢਲਾ ਮ�ੱਲ ਰੱਖਦਾ ਹੈ\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "ਹੈੱਡਰ ਵਿੱਚ `%s' ਹੈੱਡਰ ਖੇਤਰ ਗ�ੰਮ ਹੈ\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "ਇੰਪ�ੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ �ਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3084,7 +3088,7 @@ msgstr ""
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
@@ -3105,32 +3109,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "ਗ�ੰਮ ਫਿਲਟਰ ਨਾਂ"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "ਗਲਤ nplurals ਮ�ੱਲ"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "ਫਾਇਲ \"%s\" ਕੱਟੀ-ਵੱਢੀ ਹੈ"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr ""
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "ਫਾਇਲ \"%s\" GNU .mo ਫਾਰਮੈਟ ਨਹੀਂ ਹੈ"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
@@ -3296,23 +3300,23 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "ਲਿਖਣ ਵਾਸਤੇ \"%s\" ਖੋਲ�ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ਠੀਕ ਜਾਵਾ ਕਲਾਸ ਨਾਂ ਨਹੀਂ ਹੈ: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3396,12 +3400,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
@@ -3421,7 +3425,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3453,7 +3457,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ਫੇਲ�ਹ"
@@ -3465,7 +3469,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3485,76 +3489,76 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ਲੱਭਣ ਵਾਲੇ ਸ਼ਬਦ ਤੋਂ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦਾ"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "ਇੰਪ�ੱਟ ਫਾਇਲ ਲੈਗੂਇਜ਼ ਦੀ ਚੋਣ:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3567,41 +3571,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3611,15 +3615,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3627,17 +3631,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "ਲੈਗੂਇਜ਼ ਖਾਸ ਚੋਣਾਂ:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ਸਭ ਲਾਇਨਾਂ ਕੱਢੋ\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3647,7 +3651,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3657,7 +3661,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3665,7 +3669,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3675,86 +3679,91 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "  -f, --files-from=FILE       ਫਾਇਲ (FILE) ਤੋਂ ਇੰਪ�ੱਟ ਫਾਇਲਾਂ ਦੀ ਸੂਚੀ ਲਵੋ\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (ਕੇਵਲ ਲੈਗੂਇਜ਼ C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (ਕੇਵਲ ਲੈਗੂਇਜ਼ C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "  -f, --files-from=FILE       ਫਾਇਲ (FILE) ਤੋਂ ਇੰਪ�ੱਟ ਫਾਇਲਾਂ ਦੀ ਸੂਚੀ ਲਵੋ\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "  -s, --short                 ਛੋਟਾ ਹੋਸਟ ਨਾਂ\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  ਆਉਟਪ�ੱਟ ਵਿੱਚ ਪੈਕੇਜ ਨਾਂ ਦਿਓ\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  ਆਉਟਪ�ੱਟ ਵਿੱਚ ਪੈਕੇਜ ਵਰਜਨ ਦਿਓ\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  msgid ਬੱਗ ਦੀ ਜਾਣਕਾਰੀ �ਡਰੈਸ ਉੱਤੇ ਦਿਓ\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3762,7 +3771,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3770,52 +3779,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "ਸਟੈਂਡਰਡ ਇੰਪ�ੱਟ"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਅੱਖਰ ਹੈ।"
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s ਉੱਤੇ ਜਾਂ ਤੋਂ ਪਹਿਲਾਂ ਉੱਤੇ ਗੈਰ-ASCII ਟਿੱਪਣੀ ਹੈ।"
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਲਾਇਨ"
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: ਸਾਵਧਾਨ: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3824,7 +3833,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3834,27 +3843,27 @@ msgstr ""
 "gettext(\"\") ਖਾਲੀ ਲਾਈਨ ਮੋੜਨ ਦੀ ਬਜਾ�\n"
 "ਹੈੱਡਰ �ਂਟਰੀ ਨਾਲ ਮੇਟਾ ਜਾਣਕਾਰੀ ਮੋੜਦਾ ਹੈ।\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "ਸਾਵਧਾਨ: ਸ਼ਬਦ '%.*s' ਲਈ ਪ�ਰਸੰਗ (context) ਮੌਜੂਦ ਨਹੀਂ"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3862,7 +3871,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
@@ -3961,13 +3970,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3975,7 +3984,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3983,7 +3992,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3991,7 +4000,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3999,7 +4008,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4007,22 +4016,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ਗਲਤ ਲਾਈਨ ਪ�ਰੀਭਾਸ਼ਾ"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
diff --git a/gettext-tools/po/pl.gmo b/gettext-tools/po/pl.gmo
index 372a88c..d38ba15 100644
--- a/gettext-tools/po/pl.gmo
+++ b/gettext-tools/po/pl.gmo
diff --git a/gettext-tools/po/pl.po b/gettext-tools/po/pl.po
index 1bcc751..0fd544d 100644
--- a/gettext-tools/po/pl.po
+++ b/gettext-tools/po/pl.po
@@ -1,18 +1,18 @@
 # Polish translations for the GNU gettext messages, tools domain
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2010, 2013, 2014, 2015 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2010, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Piotr Pogorzelski <ppogorze@ippt.gov.pl>, 1995
 # Jakub Bogusz <qboosh@pld-linux.org>, 2002, 2003, remarks to some 18 messages in 2014
 # Piotr DrÄ…g <piotrdrag@gmail.com>, remarks on grammar errors in 2014
 # Jakub Bogusz <qboosh@pld-linux.org>, 3 typos, 2015
-# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003-2007, 2010, 2013-2015
+# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003-2007, 2010, 2013-2016
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19.4.73\n"
+"Project-Id-Version: GNU gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-07-15 18:54+0200\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-01 12:15+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -113,7 +113,7 @@ msgid "Unknown system error"
 msgstr "Nieznany błąd systemu"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -191,15 +191,15 @@ msgstr "błędny argument source_version do compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "błędny argument target_version do compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "tworzenie \"%s\" nie powiodło się"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -225,39 +225,39 @@ msgid "%s subprocess I/O error"
 msgstr "błąd wejścia/wyjścia podprocesu %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "pamięć wyczerpana"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "kompilacja wątków nie udała się"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "pisanie do podprocesu %s nie powiodło się"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "czytanie z podprocesu %s nie powiodło się"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "nie można ustawić nieblokującego wejścia/wyjścia dla podprocesu %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "komunikacja z podprocesem %s nie powiodła się"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "podproces %s zakończony z kodem wyjścia %d"
@@ -285,29 +285,29 @@ msgstr "podproces %s zakończony z kodem wyjścia %d"
 #. and use glyphs suitable for your language.
 #: gnulib-lib/quotearg.c:347
 msgid "`"
-msgstr "\""
+msgstr "„"
 
 #: gnulib-lib/quotearg.c:348
 msgid "'"
-msgstr "\""
+msgstr "�"
 
 #: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr "ustawienie uprawnień do %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "nie można utworzyć potoku"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "błąd _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "nie można odtworzyć deskryptora pliku nr %d: niepowodzenie dup2()"
@@ -326,32 +326,32 @@ msgstr "podproces %s otrzymał krytyczny sygnał %d"
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
-msgstr ""
+msgstr "Składnikiem początkowym musi być <%s>"
 
 #: src/cldr-plurals.c:83
-#, fuzzy, c-format
+#, c-format
 msgid "The element <%s> does not contain a <%s> element"
-msgstr "Element główny <%s> nie jest dozwolony w prawidłowym pliku Glade"
+msgstr "Składnik <%s> nie zawiera składnika <%s>"
 
 #: src/cldr-plurals.c:105 src/cldr-plurals.c:146
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
-msgstr ""
+msgstr "Składnik <%s> nie ma atrybutu <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Napisz „%s --help� żeby otrzymać więcej informacji.\n"
 
 #: src/cldr-plurals.c:195
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
-msgstr "Składnia: %s [OPCJA] [PLIK]...\n"
+msgstr "Składnia: %s [OPCJA...] [LOKALIZACJA REGU�Y]...\n"
 
 #: src/cldr-plurals.c:200
 #, c-format, no-wrap
@@ -362,8 +362,14 @@ msgid ""
 "LOCALE from RULES and print them in a form suitable for gettext use.\n"
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
+"Pobranie lub zamiana reguł liczby mnogiej Unicode CLRD.\n"
+"\n"
+"Jeżeli podane są zarówno LOKALIZACJA, jak REGU�Y, program czyta reguły\n"
+"liczby mnogiej CLRD dla LOKALIZACJI z REGU� i wypisuje je w formacie\n"
+"odpowiednim do użycia przez gettext. Jeżeli nie są podane argumenty, reguły\n"
+"CLRD czytane są ze standardowego wejścia.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -373,26 +379,28 @@ msgstr ""
 "Podobnie dla argumentów opcjonalnych.\n"
 
 #: src/cldr-plurals.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -h, --help                  wyświetlenie tego opisu i zakończenie\n"
+msgstr ""
+"  -c, --cldr                  wypisanie reguł liczby mnogiej w formacie "
+"CLRD\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  wyświetlenie tego opisu i zakończenie\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               wypisanie informacji o wersji i zakończenie pracy\n"
@@ -402,20 +410,20 @@ msgstr "  -V, --version               wypisanie informacji o wersji i zakończen
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raporty o błędach prosimy wysyłać do bug-gnu-gettext@gnu.org .\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -429,10 +437,10 @@ msgstr ""
 "Autorzy NIE DAJÄ„ GWARANCJI, na ile pozwala na to prawo.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Program napisał %s.\n"
@@ -440,41 +448,41 @@ msgstr "Program napisał %s.\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cldr-plurals.c:295
 msgid "Daiki Ueno"
-msgstr ""
+msgstr "Daiki Ueno"
 
 #: src/cldr-plurals.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s cannot be read"
-msgstr "%s istnieje, ale nie może zostać przeczytany"
+msgstr "%s nie może zostać przeczytany"
 
 #: src/cldr-plurals.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "cannot extract rules for %s"
-msgstr "nie można usunąć katalogu tymczasowego %s"
+msgstr "nie można wczytać reguł dla %s"
 
 #: src/cldr-plurals.c:331
 #, c-format
 msgid "cannot parse CLDR rule"
-msgstr ""
+msgstr "nie można zrozumieć reguły CLRD"
 
 #: src/cldr-plurals.c:366
 #, c-format
 msgid "extra operand %s"
-msgstr ""
+msgstr "nadmiarowy argument %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "błąd w czasie otwierania \"%s\" do czytania"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -482,19 +490,19 @@ msgstr ""
 "specyfikacja formatu dla argumentu %u, obecna w „%s�, nie istnieje w „%s�"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "specyfikacja formatu dla argumentu %u nie istnieje w „%s�"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -533,8 +541,7 @@ msgstr ""
 "Napis odwołuje się do argumentu numer %u, ale ignoruje argument numer %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "nie zgadza się liczba specyfikacji formatu w „%s� i w „%s�"
@@ -859,8 +866,8 @@ msgstr "specyfikacje formatu w „%s� i w „%s� nie są równoważne"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "specyfikacje formatu w „%s� nie są podzbiorem tych z „%s�"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "specyfikacja formatu dla argumentu „%s� nie istnieje w „%s�"
@@ -879,17 +886,17 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "W dyrektywie numer %u „%c� nie może być początkiem nazwy pola."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "W dyrektywie numer %u „%c� nie może być początkiem argumentu getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "W dyrektywie numer %u „%c� nie może być początkiem argumentu getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -897,12 +904,12 @@ msgstr ""
 "W dyrektywie numer %u w specyfikacji formatu nie może być więcej poziomów "
 "zagłębień."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "W dyrektywie numer %u jest niezakończona dyrektywa formatu."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -910,13 +917,13 @@ msgstr ""
 "�ańcuch odwołuje się do argumentów jednocześnie poprzez nazwy i nienazwane "
 "specyfikacje."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "�ańcuch odwołuje się do argumentu o nazwie „%s� na niekompatybilne sposoby."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -924,7 +931,7 @@ msgstr ""
 "specyfikacje formatu w „%s� potrzebują mapowania, a te w „%s� potrzebują "
 "krotki"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -932,14 +939,14 @@ msgstr ""
 "specyfikacje formatu w „%s� potrzebują krotki, a te w „%s� potrzebują "
 "mapowania"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "specyfikacja formatu dla argumentu „%s�, obecna w „%s�, nie istnieje w „%s�"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -996,7 +1003,7 @@ msgid ""
 msgstr "Znak kończący dyrektywę %u nie jest cyfrą od 1 do 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1044,11 +1051,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy komputera\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informacje:\n"
@@ -1059,60 +1066,60 @@ msgid "could not get host name"
 msgstr "nie można odczytać nazwy komputera"
 
 #: src/its.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "selector is not specified"
-msgstr "muszą być podane przynajmniej dwa pliki"
+msgstr "nie zostÄ…Å‚ podany selektor"
 
 #: src/its.c:326 src/its.c:1550
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create XPath context"
-msgstr "nie można utworzyć potoku"
+msgstr "nie można utworzyć contekstu XPath"
 
 #: src/its.c:344
 #, c-format
 msgid "cannot evaluate XPath expression: %s"
-msgstr ""
+msgstr "nie można rozwinąc wyrażenia XPath: %s"
 
 #: src/its.c:614
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
-msgstr ""
+msgstr "węzeł „%s� nie zawiera „%s�"
 
 #: src/its.c:1001
-#, fuzzy, c-format
+#, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
-msgstr "błędny argument %s opcji %s"
+msgstr "błędna wartośc atrybutu „%s� dla „%s�"
 
 #: src/its.c:1333
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
-msgstr ""
+msgstr "składnik początkowy w przestrzeni nazw %s nie ma nazwy „rules�"
 
 #: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
 #: src/locating-rule.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read %s: %s"
-msgstr "nie można utworzyć potoku"
+msgstr "nie można odczytać %s: %s"
 
 #: src/its.c:1573
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
-msgstr ""
+msgstr "nie można rozwinąć ścieżki położenia XPath: %s"
 
 #: src/locating-rule.c:236
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" node does not have \"%s\""
-msgstr "%s nie istnieje"
+msgstr "węzeł „%s� nie ma „%s�"
 
 #: src/locating-rule.c:307
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read XML file %s"
-msgstr "nie można utworzyć pliku wyjściowego \"%s\""
+msgstr "nie można odczytać pliku XML „%s�"
 
 #: src/locating-rule.c:319
 #, c-format
 msgid "the root element is not \"locatingRules\""
-msgstr ""
+msgstr "składnikiem początkowym nie jest „locatingRules�"
 
 #: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
 #: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
@@ -1120,12 +1127,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "dozwolony najwyżej jeden plik wejściowy"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s i %s wzajemnie siÄ™ wykluczajÄ…"
@@ -1144,7 +1151,7 @@ msgstr ""
 "Filtrowanie komunikatów z katalogu tłumaczeń zgodnie z ich atrybutami oraz\n"
 "manipulowanie atrybutami.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1154,10 +1161,10 @@ msgid ""
 msgstr ""
 "Argumenty obowiązkowe opcji długich są obowiązkowe także dla krótkich.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Położenie pliku wejściowego:\n"
@@ -1167,10 +1174,10 @@ msgstr "Położenie pliku wejściowego:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  PLIK-WEJÅšCIOWY              wczytanie pliku PO\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1185,23 +1192,23 @@ msgstr ""
 "Jeśli nie podano pliku wejściowego lub plik to -, czytane jest standardowe\n"
 "wejście.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Położenie pliku wyjściowego:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=PLIK      zapisanie wyniku do podanego pliku\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1213,7 +1220,7 @@ msgstr ""
 "podany\n"
 "plik to -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Wybór komunikatów:\n"
@@ -1275,7 +1282,7 @@ msgstr ""
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           oznaczenie wszystkich komunikatów jako\n"
-"                                nie-„fuzzy�\n"
+"                                nie będących „fuzzy�\n"
 
 #: src/msgattrib.c:472
 #, c-format
@@ -1346,9 +1353,9 @@ msgid ""
 msgstr ""
 "      --obsolete              synonim dla --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1372,17 +1379,17 @@ msgstr ""
 "      --stringtable-input     plik wejściowy ma składnię .string z\n"
 "                                NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Szczegóły dotyczące wyjścia:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1398,17 +1405,17 @@ msgstr ""
 "albo\n"
 "                              „html�.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=PLIKSTYLU       podanie pliku reguł CSS dla opcji --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1416,9 +1423,9 @@ msgstr ""
 "  -e, --no-escape             nie używanie sekwencji C na wyjściu "
 "(domyślne)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1426,37 +1433,37 @@ msgstr ""
 "  -E, --escape                używanie sekwencji C, bez znaków "
 "rozszerzonych\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              zapisanie pliku PO nawet jeśli jest pusty\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                zapisanie pliku .po w stylu z wcięciami\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           nie zapisywanie linii „#: plik:linia�\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          generowanie linii „#: plik:linia� (domyślne)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1464,33 +1471,33 @@ msgstr ""
 "      --strict                zapisanie pliku .po ściśle zgodnego z "
 "Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     zapisanie pliku .properties Javy\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    zapisanie pliku .strings NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 "  -w, --width=LICZBA          ustawienie szerokości strony dla wyjścia\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1500,32 +1507,32 @@ msgstr ""
 "dłuższych\n"
 "                                niż szerokość strony\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generowanie posortowanego wyjścia\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          sortowanie wyjścia według położenia pliku\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "podane niemożliwe kryteria selekcji (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Składnia: %s [OPCJA] [PLIK-WEJŚCIOWY]\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1547,24 +1554,24 @@ msgstr ""
 "i pozycje w plikach zostaną zgromadzone, chyba że zostanie podana opcja\n"
 "--use-first, wtedy będą skopiowane z pierwszego definiującego je pliku PO.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  PLIK-WEJŚCIOWY ...          pliki wejściowe\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=PLIK       odczytanie listy plików wejściowych z PLIKU\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jeśli plik wejściowy to -, czytane jest standardowe wejście.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1574,7 +1581,7 @@ msgstr ""
 "                                mniejszą od LICZBY, domyślnie "
 "nieskończoności\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1583,7 +1590,7 @@ msgstr ""
 "  ->, --more-than=LICZBA      wypisanie komunikatów z liczbą definicji\n"
 "                                większą od LICZBY, domyślnie 1\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1592,7 +1599,7 @@ msgstr ""
 "  -u, --unique                skrót dla --less-than=2, żądanie wypisania\n"
 "                                wyłącznie unikalnych komunikatów\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1601,7 +1608,7 @@ msgstr ""
 "  -P, --properties-input      pliki wejściowe mają składnię .properties "
 "Javy\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1611,12 +1618,12 @@ msgstr ""
 "      --stringtable-input     pliki wejściowe mają składnię .strings\n"
 "                                NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAZWA         kodowanie dla wyjścia\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1625,14 +1632,14 @@ msgstr ""
 "      --use-first             użycie pierwszego dostępnego tłumaczenia\n"
 "                                każdego komunikatu zamiast łączenia wielu\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=NAZWA_KATALOGU   ustawienie pola „Language� w nagłówku\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1740,7 +1747,7 @@ msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany w %s"
 msgid "warning: this message is not used"
 msgstr "uwaga: ten komunikat nie został użyty"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1748,12 +1755,12 @@ msgstr[0] "znaleziono %d błąd krytyczny"
 msgstr[1] "znaleziono %d błędy krytyczne"
 msgstr[2] "znaleziono %d błędów krytycznych"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "muszą być podane przynajmniej dwa pliki"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1773,7 +1780,7 @@ msgstr ""
 "zostanÄ… zachowane, ale tylko z pierwszego definiujÄ…cego je pliku PO. Pozycje\n"
 "w plikach dla wszystkich plików PO zostaną zgromadzone.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1782,7 +1789,7 @@ msgstr ""
 "  ->, --more-than=LICZBA      wypisanie komunikatów z liczbą definicji\n"
 "                                większą od LICZBY, domyślnie 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1833,7 +1840,7 @@ msgstr ""
 "      --strict                zapisanie pliku .po ściśle zgodnego z "
 "Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "nie podano nazwy pliku wejściowego"
@@ -2021,76 +2028,76 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "dane z filtra nie są zakończone znakiem nowej linii"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argument %s powinien być pojedynczym znakiem przestankowym"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "błędna endianness: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "jeżeli są podane %s i %s, nie należy podawać pliku wejściowego"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s wymaga podania \"-d katalog\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s wymaga podania \"-l lokalizacja\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s wymaga podania \"--template wzorzec\""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s wymaga podania \"-o plik\""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s i %s wykluczajÄ… siÄ™ wzajemnie w %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s jest prawidłowe tylko z %s lub %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s jest prawidłowe tylko z %s, %s albo z %s"
 
-#: src/msgfmt.c:723
-#, fuzzy, c-format
+#: src/msgfmt.c:713
+#, c-format
 msgid "cannot locate ITS rules for %s"
-msgstr "nie można utworzyć pliku wyjściowego \"%s\""
+msgstr "nie można odnaleźć reguł ITS dla %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -2098,7 +2105,7 @@ msgstr[0] "%d przetłumaczony komunikat"
 msgstr[1] "%d przetłumaczone komunikaty"
 msgstr[2] "%d przetłumaczonych komunikatów"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -2106,7 +2113,7 @@ msgstr[0] ", %d tłumaczenie budzi wątpliwości"
 msgstr[1] ", %d tłumaczenia budzą wątpliwości"
 msgstr[2] ", %d tłumaczeń budzi wątpliwości"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -2114,28 +2121,28 @@ msgstr[0] ", %d nie przetłumaczony komunikat"
 msgstr[1] ", %d nie przetłumaczone komunikaty"
 msgstr[2] ", %d nie przetłumaczonych komunikatów"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Składnia: %s [OPCJA] nazwa-pliku.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generowanie binarnego katalogu komunikatów z tekstowego opisu tłumaczeń.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nazwa-pliku.po ...          pliki wejściowe\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Tryb działania:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2144,7 +2151,7 @@ msgstr ""
 "  -j, --java                  tryb Javy: generowanie klas Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2152,12 +2159,12 @@ msgid ""
 msgstr ""
 "      --java2                 jak --java dla Javy 2 (JDK 1.2 i nowsze)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                tryb C#: generowanie pliku .dll .NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2166,19 +2173,19 @@ msgstr ""
 "      --csharp-resources      tryb zasobów C#: generowanie pliku .resources ."
 "NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   tryb Tcl: generowanie pliku tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    tryb Qt: generowanie pliku .qm\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2186,36 +2193,36 @@ msgstr ""
 "      --desktop               tryb Elementu Pulpitu: generowanie pliku ."
 "desktop\n"
 
-#: src/msgfmt.c:957
-#, fuzzy, c-format
+#: src/msgfmt.c:947
+#, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
-msgstr "      --qt                    tryb Qt: generowanie pliku .qm\n"
+msgstr "      --xml                   tryb XML: generowanie pliku XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                włączenie trybu ścisłej zgodności z Uniforum\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Jeśli plikiem wyjściowym jest -, wynik jest kierowany na standardowe "
 "wyjście.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie Javy:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ZASÓB        nazwa zasobu\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2223,21 +2230,21 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOKALIZACJA    nazwa lokalizacji - język lub język_KRAJ\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr "      --source                utworzenie pliku .java zamiast .class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d KATALOG                  bazowy katalog w hierarchii katalogu klas\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2250,12 +2257,12 @@ msgstr ""
 "Klasa\n"
 "jest zapisywana w podanym katalogu.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2264,7 +2271,7 @@ msgstr ""
 "  -d KATALOG                  katalog bazowy plików .dll zależnych od "
 "locale\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2272,20 +2279,20 @@ msgid ""
 msgstr ""
 "Opcje -l i -d sÄ… obowiÄ…zkowe. Plik .dll jest zapisywany w podkatalogu "
 "podanego\n"
-"katalogu, którego nazwa zależy od locale.\n"
+"katalogu, którego nazwa zależy od lokalizacji (locale).\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Położenie pliku wyjściowego w trybie Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d KATALOG                  bazowy katalog katalogów komunikatów .msg\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2293,22 +2300,22 @@ msgid ""
 msgstr ""
 "Opcje -l i -d sÄ… obowiÄ…zkowe. Plik .msg jest zapisywany w podanym katalogu.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Opcje trybu Elementu Pulpitu (Desktop Entry):\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=WZORZEC          plik .desktop użyty jako WZORZEC\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d KATALOG                  bazowy katalog plików .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2317,7 +2324,7 @@ msgstr ""
 "  -kS�OWO, --keyword=S�OWO    dodatkowe słowo kluczowe do poszukiwania\n"
 "  -k, --keyword               bez używania domyślnych słów kluczowych\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2329,27 +2336,27 @@ msgstr ""
 "wejściowe są szukane w podanym katalogu zamiast pośród argumentów "
 "polecenia.\n"
 
-#: src/msgfmt.c:1024
-#, fuzzy, c-format
+#: src/msgfmt.c:1014
+#, c-format
 msgid "XML mode options:\n"
-msgstr "Opcje trybu Elementu Pulpitu (Desktop Entry):\n"
+msgstr "Opcje trybu XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
-msgstr ""
+msgstr "  -L, --language=NAZWA        rozpoznawanie podanego języka XML\n"
 
-#: src/msgfmt.c:1032
-#, fuzzy, c-format
+#: src/msgfmt.c:1022
+#, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
-msgstr "  --template=WZORZEC          plik .desktop użyty jako WZORZEC\n"
+msgstr "  --template=WZORZEC          plik XML użyty jako WZORZEC\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacja pliku wejściowego:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2360,14 +2367,14 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          sprawdzenie tłumaczeń z formatów zależnych od\n"
 "                              języka\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2376,7 +2383,7 @@ msgstr ""
 "      --check-header          sprawdzenie obecności i zawartości wpisu "
 "nagłówka\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2385,7 +2392,7 @@ msgstr ""
 "      --check-domain          sprawdzenie konfliktów między dyrektywami\n"
 "                                dotyczÄ…cymi domeny i opcjÄ… --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2394,7 +2401,7 @@ msgstr ""
 "  -C, --check-compatibility   kontrola czy GNU msgfmt działa jak X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2405,13 +2412,13 @@ msgstr ""
 "klawiszowych\n"
 "                                dla opcji w menu\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             użycie na wyjściu niepewnych (fuzzy) wpisów\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2420,7 +2427,7 @@ msgstr ""
 "(domyślnie:\n"
 "                              %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2433,7 +2440,7 @@ msgstr ""
 "domyślna\n"
 "                                kolejność zależy od platformy\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2441,86 +2448,86 @@ msgstr ""
 "      --no-hash               tworzenie pliku binarnego bez tablicy "
 "haszujÄ…cej\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            wypisanie statystyk dotyczących tłumaczeń\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 "  -v, --verbose               zwiększenie ilości podawanych informacji\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "uwaga: brakujący lub niepoprawny nagłówek pliku PO\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "uwaga: konwersja zestawu znaków nie będzie działać\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "uwaga: nagłówek pliku PO jest niepewny (fuzzy)\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "uwaga: starsze wersje msgfmt nie zgłoszą błędu w tym miejscu\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nazwa domeny \"%s\" nie jest odpowiedniÄ… nazwa pliku"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nazwa domeny \"%s\" nie jest dobra jako nazwa pliku: użycie przedrostka"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "dyrektywa „domain %s� zignorowana"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "zignorowana pusta wartość „msgstr�"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "zignorowana niepewna (fuzzy) wartość „msgstr�"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uwaga: plik źródłowy zawiera tłumaczenie budzące wątpliwości"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s nie istnieje"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s istnieje, ale nie może zostać przeczytany"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "błąd w czasie czytania \"%s\""
@@ -2764,12 +2771,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Polskie tłumaczenia dla pakietu %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "aktualny zestaw znaków \"%s\" nie jest przenośną nazwą kodowania"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dwa różne zestawy znaków \"%s\" oraz \"%s\" w pliku wejściowym"
@@ -2790,14 +2797,14 @@ msgstr ""
 "domena \"%s\" w pliku wejściowym „%s� nie zawiera wpisu nagłówka ze "
 "specyfikacją zestawu znaków"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "docelowy zestaw znaków \"%s\" nie jest przenośną nazwą kodowania."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "uwaga: "
@@ -2890,27 +2897,27 @@ msgstr ""
 "Wyjście „%s� może być niepoprawne.\n"
 "Możliwym obejściem problemu jest ustawienie LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "wyrażenie do wyliczania liczby mnogiej może zwrócić wartości ujemne"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ale wyrażenie do wyliczania liczby mnogiej może zwrócić "
 "wartości do %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 "wyrażenie do wyliczania liczby mnogiej może spowodować dzielenie przez zero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "wyrażenie do wyliczania liczby mnogiej może spowodować przepełnienie"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2918,37 +2925,37 @@ msgstr ""
 "wyrażenie do wyliczania liczby mnogiej może spowodować wyjątki, możliwe "
 "dzielenie przez zero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Proszę spróbować tego, poprawnego dla %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "katalog komunikatów zawiera tłumaczenia form mnogich"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ale wpis nagłówka nie ma atrybutu \"plural=WYRAŻENIE\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ale wpis nagłówka nie ma atrybutu \"nplurals=LICZBA\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "błędna wartość nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "błędne wyrażenie do wyliczania liczby mnogiej"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2956,7 +2963,7 @@ msgstr[0] "ale niektóre komunikaty mają tylko jedną formę mnogą"
 msgstr[1] "ale niektóre komunikaty mają tylko %lu formy mnogie"
 msgstr[2] "ale niektóre komunikaty mają tylko %lu form mnogich"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2964,7 +2971,7 @@ msgstr[0] "ale niektóre komunikaty mają jedną formę mnogą"
 msgstr[1] "ale niektóre komunikaty mają %lu formy mnogie"
 msgstr[2] "ale niektóre komunikaty mają %lu form mnogich"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2972,91 +2979,96 @@ msgstr ""
 "katalog komunikatów zawiera tłumaczenia form mnogich, ale brakuje wpisu "
 "nagłówka z \"Plural-Forms: nplurals=LICZBA; plural=WYRAŻENIE;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "linie „msgid� i „msgid_plural� nie zaczynają się obie od „\\n�`"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "linie „msgid� i „msgstr[%u]� nie zaczynają się obie od „\\n�`"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "linie „msgid� i „msgstr� nie zaczynają się obie od „\\n�`"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "linie „msgid� i „msgid_plural� nie kończą się obie na „\\n�"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "linie „msgid� i „msgstr[%u]� nie kończą się obie na „\\n�"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "linie „msgid� i „msgstr� nie kończą się obie na „\\n�"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "obsługa form mnogich jest rozszerzeniem gettexta GNU"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "w msgstr brakuje skrótu oznaczenia klawiszowego „%c�"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr zawiera zbyt dużo oznaczeń skrótów klawiszowych „%c�"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "pole nagłówka „%s� nadal zawiera początkową wartość domyślną\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "w nagłówku brakuje pola „%s�\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "Wielokropek ASCII („...�) zamiast znaku Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 "odstęp przez wielokropkiem znaleziony pośród napisów widocznych dla "
 "użytkownika"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Podwójny cudzysłów ASCII użyty zamiast znaku Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Pojedynczy cudzysłów ASCII użyty zamiast znaku Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "Punktor ASCII („%c�) zamiast znaku Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: dane wejściowe są błędne jeżeli kodowanie to \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: błąd w czasie zamiany kodowania z \"%s\" na \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "plik wejściowy nie zawiera wpisu nagłówka ze specyfikacją zestawu znaków"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3065,7 +3077,7 @@ msgstr ""
 "Nie można przekonwertować z \"%s\" do \"%s\". %s opiera się na iconv(), a "
 "iconv() nie obsługuje tej konwersji."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3074,8 +3086,8 @@ msgstr ""
 "Konwersja z \"%s\" do \"%s\" wprowadza duplikaty: niektóre różniące się "
 "msgid stajÄ… siÄ™ identyczne."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3315,7 +3327,7 @@ msgid ""
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 "Opcje -l i -d sÄ… obowiÄ…zkowe. Plik .dll znajduje siÄ™ w podkatalogu podanego\n"
-"katalogu, którego nazwa zależy od locale.\n"
+"katalogu, którego nazwa zależy od lokalizacji (locale).\n"
 
 #: src/msgunfmt.c:480
 #, c-format
@@ -3511,7 +3523,7 @@ msgstr "znak końca wiersza wewnątrz napisu"
 msgid "context separator <EOT> within string"
 msgstr "separator kontekstu <EOT> wewnÄ…trz napisu"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ten plik nie może zawierać dyrektyw domain"
@@ -3526,39 +3538,37 @@ msgstr "to jest położenie pierwszej definicji"
 
 #: src/read-desktop.c:267
 msgid "unterminated group name"
-msgstr ""
+msgstr "niezakończona nazwa grupy"
 
 #: src/read-desktop.c:286
-#, fuzzy
 msgid "invalid non-blank character"
-msgstr "uwaga: błędny znak unikodowy"
+msgstr "uwaga: błędny znak niepusty"
 
-#: src/read-desktop.c:403
-#, fuzzy, c-format
+#: src/read-desktop.c:405
+#, c-format
 msgid "missing '=' after \"%s\""
-msgstr "brak nazwy filtru"
+msgstr "brak „=� po „%s�"
 
-#: src/read-desktop.c:466
-#, fuzzy
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
-msgstr "błędna wartość nplurals"
+msgstr "błędna niepusta linia"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "plik \"%s\" jest obcięty"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "plik \"%s\" zawiera napis, który nie jest zakończony znakiem NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "plik \"%s\" nie jest w formacie .mo GNU"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "plik \"%s\" zawiera napis nie zakończony znakiem NUL pod %s"
@@ -3738,24 +3748,24 @@ msgstr "kompilacja klasy C# nie udała się, proszę użyć --verbose"
 msgid "compilation of C# class failed"
 msgstr "kompilacja klasy C# nie udała się"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "błąd otwarcia \"%s\" do pisania"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "niepoprawna nazwa klasy Javy: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompilacja klasy Javy nie udała się, proszę użyć --verbose lub ustawić $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilacja klasy Javy nie udała się, proszę ustawić $JAVAC"
@@ -3862,12 +3872,12 @@ msgstr ""
 "katalog komunikatów zawiera tłumaczenia form mnogich,\n"
 "ale format katalogu komunikatów Tcl-a nie obsługuje liczby mnogiej\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uwaga: nie zakończony napis"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uwaga: nie zakończone wyrażenie regularne"
@@ -3887,7 +3897,7 @@ msgstr "%s:%d: uwaga: niezakończona stała znakowa"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Proszę podać kodowanie źródła przy pomocy --from-code ."
 
@@ -3927,7 +3937,7 @@ msgstr ""
 "%s:%d: Niekompletna sekwencja wielobajtowa na końcu linii.\n"
 "Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: błąd iconv"
@@ -3941,7 +3951,7 @@ msgstr ""
 "%s:%d: Nieprawidłowa sekwencja wielobajtowa.\n"
 "Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code .\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: uwaga: błędny znak unikodowy"
@@ -3961,54 +3971,56 @@ msgstr "%s:%d: uwaga: znaleziono „)�, oczekiwano „}�"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uwaga: znaleziono „}�, oczekiwano „)�"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "„%s� nie jest prawidłową nazwą kodowania. W zastępstwie użyję ASCII.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "symbol „%s� nie rozpoznany przez sprawdzaniu składni"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "nieznany koniec zdania typu „%s�"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing nie może być użyte przy pisaniu na standardowe wyjście"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nie może działać bez podania słów kluczowych"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
-msgstr ""
+msgstr "uwaga: nie istnieje plik reguł ITS „%s�"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
+"uwaga: nie istnieje plik reguł ITS „%s; sprawdź swoją instalację programu "
+"gettext�"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "uwaga: typ pliku „%s� z rozszerzeniem „%s� jest nieznany; spróbuję C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Wyciągnięcie przetłumaczalnych napisów z podanych plików wejściowych.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4016,24 +4028,24 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAZWA  użycie NAZWA.po (nie messages.po) dla wyjścia\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=PLIK           zapisanie wyniku do podanego pliku\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=KATALOG    umieszczenie plików wyjściowych w KATALOGU\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wybór języka pliku wejściowego:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4054,12 +4066,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   skrót dla --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4067,7 +4079,7 @@ msgid ""
 msgstr ""
 "Domyślnie język jest zgadywany na podstawie rozszerzenia pliku wejściowego.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4076,23 +4088,23 @@ msgstr ""
 "      --from-code=NAZWA       kodowanie plików wejściowych\n"
 "                                (oprócz Pythona, Tcl-a, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Domyślnie zakłada się, że pliki wejściowe są w ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         dołączenie komunikatów do istniejącego pliku\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=PLIK.po  pominięcie wpisów z PLIKU.po\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4112,20 +4124,20 @@ msgstr ""
 "kluczowym)\n"
 "                                w pliku wyjściowym\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NAZWA           sprawdzenie składni komunikatów\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode - wielokropki Unicode,\n"
-"                                 sekwencje spacja-wielokropek, cudzysłowy\n"
-"                                 Unicode)\n"
+"                                 quote-unicode, bullet-unicode - znaki\n"
+"                                 Unicode: wielokropki, sekwencje\n"
+"                                 odstęp-wielokropek, cudzysłowy, punktory\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4137,17 +4149,17 @@ msgstr ""
 "podwójny\n"
 "                                odstęp)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opcje specyficzne dla języka:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           wyciągnięcie wszystkich napisów\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4162,7 +4174,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4177,7 +4189,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4188,7 +4200,7 @@ msgstr ""
 "numer\n"
 "                              ARG słowa kluczowego S�OWO\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4203,38 +4215,48 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             przetwarzanie na wejściu trójznaków ANSI C\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (tylko języki C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "--its=FILE                    zastosowanie reguł ITS z PLIKU\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (tylko języki oparte na XML-u)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    rozpoznawanie napisów w formacie Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (tylko język C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   rozpoznawanie napisów w formacie KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 rozpoznawanie napisów w formacie Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4242,29 +4264,23 @@ msgstr ""
 "      --debug                 więcej szczegółów o rozpoznawaniu formatów\n"
 "                              napisów\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapisanie pliku .properties Javy\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=PLIK       odczytanie listy plików wejściowych z PLIKU\n"
-
-#: src/xgettext.c:1198
-#, fuzzy, c-format
+#: src/xgettext.c:1188
+#, c-format
 msgid "      --itstool               write out itstool comments\n"
-msgstr "      --indent                zapisanie pliku w stylu z wcięciami\n"
+msgstr "      --itstool               wypisanie komentarzy itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=NAPIS    wypisanie właściciela praw autorskich\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4273,24 +4289,24 @@ msgstr ""
 "dla\n"
 "                                zewnętrznych projektów\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKIET   podanie nazwy PAKIETU na wyjściu\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=WERSJA    podanie na wyjściu WERSJI pakietu\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=ADRES@EMAIL  adres do zgłaszania błędów w msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4300,7 +4316,7 @@ msgstr ""
 "  -m[NAPIS], --msgstr-prefix[=NAPIS]    użycie NAPISU lub \"\" jako\n"
 "                                przedrostka wpisów msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4311,7 +4327,7 @@ msgstr ""
 "przyrostka\n"
 "                                wpisów msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4319,31 +4335,31 @@ msgid ""
 msgstr ""
 "Argument opcji --flag nie ma składni <keyword>:<argnum>:[pass-]<flag>: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standardowe wejście"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Znak nie-ASCII w %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Komentarz ze znakami nie-ASCII przy albo przez %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Napis nie-ASCII przy %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: uwaga: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4352,7 +4368,7 @@ msgstr ""
 "Chociaż %s jest użyte w formacie położenia napisu, %s nie jest prawidłowym "
 "formatem. Powód: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4361,7 +4377,7 @@ msgstr ""
 "%s nie jest prawidłowym formatem napisu %s, mimo że jest tak zadeklarowany. "
 "Powód: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4375,7 +4391,7 @@ msgstr ""
 "Rozważ użycie formatu z nazwami argumentów i mapowania zamiast\n"
 "zestawu argumentów.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4385,27 +4401,27 @@ msgstr ""
 "gettext(\"\") zwraca wpis nagłówka z meta-informacjami,\n"
 "a nie pusty napis.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "niejednoznaczna specyfikacja argumentu słowa kluczowego „%.*s�"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "uwaga: brak kontekstu słowa kluczowego „%.*s�"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "uwaga: brak kontekstu dla mnogiego argumentu słowa kluczowego „%.*s�"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "pomieszanie kontekstów między formą pojedynczą i mnogą"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4417,7 +4433,7 @@ msgstr ""
 "zmiennÄ… MSGID_BUGS_ADDRESS; w przeciwnym wypadku proszÄ™\n"
 "podać opcję --msgid-bugs-address z linii poleceń.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "nieznany język „%s�"
@@ -4526,7 +4542,7 @@ msgstr "%s:%d: błędna interpolacja (\"\\L\") 8-bitowego znaku \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: błędna interpolacja (\"\\U\") 8-bitowego znaku \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4534,7 +4550,7 @@ msgstr ""
 "Proszę podać kodowanie źródła przy pomocy --from-code albo przez komentarz\n"
 "wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4545,7 +4561,7 @@ msgstr ""
 "Proszę podać poprawne kodowanie źródłowe przy pomocy --from-code albo przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4557,7 +4573,7 @@ msgstr ""
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4569,7 +4585,7 @@ msgstr ""
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4581,7 +4597,7 @@ msgstr ""
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4593,22 +4609,22 @@ msgstr ""
 "przez\n"
 "komentarz wg specyfikacji w http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Nieznane kodowanie \"%s\". Użyte będzie kodowanie ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: błędna definicja napisu"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: brakujÄ…ca liczba po #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: błędne wyrażenie napisowe"
@@ -4632,138 +4648,123 @@ msgid "<unnamed>"
 msgstr "<nienazwany>"
 
 #: libgettextpo/markup.c:366 libgettextpo/markup.c:449
-#, fuzzy
 msgid "invalid UTF-8 sequence"
-msgstr "błędna sekwencja sterująca"
+msgstr "błędny kod UTF-8"
 
 #: libgettextpo/markup.c:377
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid name: %c"
-msgstr "niepoprawna nazwa klasy Javy: %s"
+msgstr "„%s� nie jest poprawną nazwą: %c"
 
 #: libgettextpo/markup.c:397
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid name: '%c'"
-msgstr "niepoprawna nazwa klasy Javy: %s"
+msgstr "„%s� nie jest poprawną nazwą: „%c�"
 
 #: libgettextpo/markup.c:523 libgettextpo/markup.c:534
 #: libgettextpo/markup.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "invalid character reference: %s"
-msgstr "błędna sekwencja sterująca"
+msgstr "błędne odniesienie do znaku: %s"
 
 #: libgettextpo/markup.c:526
 msgid "not a valid number specification"
-msgstr ""
+msgstr "nieprawidłowa specyfikacja liczby"
 
 #: libgettextpo/markup.c:535 libgettextpo/markup.c:606
 msgid "no ending ';'"
-msgstr ""
+msgstr "brak zakończenia „;�"
 
 #: libgettextpo/markup.c:560
 msgid "non-permitted character"
-msgstr ""
+msgstr "niedozwolony znak"
 
 #: libgettextpo/markup.c:599
 msgid "empty"
-msgstr ""
+msgstr "pusty"
 
 #: libgettextpo/markup.c:604
 msgid "unknown"
-msgstr ""
+msgstr "nieznany"
 
 #: libgettextpo/markup.c:608
-#, fuzzy, c-format
+#, c-format
 msgid "invalid entity reference: %s"
-msgstr "błędna endianness: %s"
+msgstr "błędne odniesienie do jednostki: %s"
 
 #: libgettextpo/markup.c:959
 msgid "document must begin with an element"
-msgstr ""
+msgstr "tekst musi zaczynać się od składnika"
 
 #: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
 #: libgettextpo/markup.c:1332
-#, fuzzy, c-format
+#, c-format
 msgid "invalid character after '%s'"
-msgstr "błędny argument %s opcji %s"
+msgstr "błędny znak po „%s�"
 
 #: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
 msgid "missing '%c'"
-msgstr ""
+msgstr "brakujące „%c�"
 
 #: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
 msgid "missing '%c' or '%c'"
-msgstr ""
+msgstr "brakujące „%c� albo „%c�"
 
 #: libgettextpo/markup.c:1333
 msgid "a close element name"
-msgstr ""
+msgstr "zamykająca nazwa składnika"
 
 #: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
 msgid "element is closed"
-msgstr ""
+msgstr "składnik jest zamknięty"
 
 #: libgettextpo/markup.c:1475
 msgid "empty document"
-msgstr ""
+msgstr "pusty tekst"
 
 #: libgettextpo/markup.c:1488
 msgid "after '<'"
-msgstr ""
+msgstr "po „<�"
 
 #: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
 msgid "elements still open"
-msgstr ""
+msgstr "ciągle otwarte składniki"
 
 #: libgettextpo/markup.c:1500
 msgid "missing '>'"
-msgstr ""
+msgstr "brakujący „>�"
 
 #: libgettextpo/markup.c:1504
 msgid "inside an element name"
-msgstr ""
+msgstr "wewnątrz nazwy składnika"
 
 #: libgettextpo/markup.c:1509
-#, fuzzy
 msgid "inside an attribute name"
-msgstr "brak nazwy filtru"
+msgstr "wewnÄ…trz nazwy atrybutu"
 
 #: libgettextpo/markup.c:1513
 msgid "inside an open tag"
-msgstr ""
+msgstr "wewnÄ…trz otwartego znacznika"
 
 #: libgettextpo/markup.c:1517
 msgid "after '='"
-msgstr ""
+msgstr "po „=�"
 
 #: libgettextpo/markup.c:1522
 msgid "inside an attribute value"
-msgstr ""
+msgstr "wewnątrz wartości atrybutu"
 
 #: libgettextpo/markup.c:1533
 msgid "inside the close tag"
-msgstr ""
+msgstr "wewnÄ…trz znacznika zamykajÄ…cego"
 
 #: libgettextpo/markup.c:1537
 msgid "inside a comment or processing instruction"
-msgstr ""
+msgstr "wewnÄ…trz komentarza albo przetwarzajÄ…cy instrukcjÄ™"
 
 #: libgettextpo/markup.c:1548
 #, c-format
 msgid "document ended unexpectedly: %s"
-msgstr ""
-
-#~ msgid "Missing context for the string extracted from '%s' element"
-#~ msgstr "Brakuje kontekstu dla łańcucha znaków wydobytego z elementu „%s�"
-
-#~ msgid "%s:%lu:%lu: %s"
-#~ msgstr "%s:%lu:%lu: %s"
-
-#~ msgid ""
-#~ "Language \"glade\" is not supported. %s relies on expat.\n"
-#~ "This version was built without expat.\n"
-#~ msgstr ""
-#~ "Język \"glade\" nie jest obsługiwany. %s polega na expat.\n"
-#~ "Ta wersja została skompilowana bez expat.\n"
+msgstr "tekst nieoczekiwanie się zakończył: %s"
diff --git a/gettext-tools/po/pt.gmo b/gettext-tools/po/pt.gmo
index 2b45079..e85305d 100644
--- a/gettext-tools/po/pt.gmo
+++ b/gettext-tools/po/pt.gmo
diff --git a/gettext-tools/po/pt.po b/gettext-tools/po/pt.po
index f587109..4d55fca 100644
--- a/gettext-tools/po/pt.po
+++ b/gettext-tools/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.10.23\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 1996-09-18 20:51 WET DST\n"
 "Last-Translator: Nuno Oliveira <nuno@eq.uc.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -106,7 +106,7 @@ msgid "Unknown system error"
 msgstr "Erro desconhecido do sistema"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -184,15 +184,15 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -215,39 +215,39 @@ msgid "%s subprocess I/O error"
 msgstr ""
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "memória exausta"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -286,18 +286,18 @@ msgstr ""
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, fuzzy, c-format
 msgid "cannot create pipe"
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "impossível criar o ficheiro de saída \"%s\""
@@ -329,11 +329,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Tente `%s --help' para mais informação\n"
@@ -353,7 +353,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -366,21 +366,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr ""
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -390,20 +390,20 @@ msgstr ""
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -413,10 +413,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
@@ -447,37 +447,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro durante a abertura de \"%s\" para leitura"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -511,8 +511,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "o número de especificações em `msgid' e `msgstr' é diferente"
@@ -801,8 +800,8 @@ msgstr "as especificações do argumento %u são diferentes"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
@@ -819,57 +818,57 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr ""
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr ""
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "as especificações do argumento %u são diferentes"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -917,7 +916,7 @@ msgid ""
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -962,11 +961,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
@@ -1038,12 +1037,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr ""
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivas"
@@ -1060,7 +1059,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1069,10 +1068,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
@@ -1082,10 +1081,10 @@ msgstr "nenhum ficheiro de entrada fornecido"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1097,23 +1096,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1122,7 +1121,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -1227,9 +1226,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1250,17 +1249,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1269,118 +1268,118 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1394,51 +1393,51 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1446,26 +1445,26 @@ msgid ""
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1578,19 +1577,19 @@ msgstr "esta mensagem é usada mas não definida em %s"
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é usada"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "encontrados %d erros fatais"
 msgstr[1] "encontrados %d erros fatais"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1603,14 +1602,14 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1655,7 +1654,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "nenhum ficheiro de entrada fornecido"
@@ -1817,206 +1816,206 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr ""
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr ""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr ""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s e %s são mutuamente exclusivas"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "impossível criar o ficheiro de saída \"%s\""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensagens traduzidas"
 msgstr[1] "%d mensagens traduzidas"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduções aproximadas"
 msgstr[1] ", %d traduções aproximadas"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensagens não traduzidas"
 msgstr[1] ", %d mensagens não traduzidas"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr ""
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2025,65 +2024,65 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2091,27 +2090,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2119,33 +2118,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2153,18 +2152,18 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2173,91 +2172,91 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nome de domínio \"%s\" não apropriado como nome de ficheiro"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nome de domínio \"%s\" não apropriado como nome de ficheiro:\n"
 "prefixo usado"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "directiva `domínio %s' ignorada"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "CUIDADO: o ficheiro fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
@@ -2436,12 +2435,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2459,14 +2458,14 @@ msgid ""
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2535,180 +2534,185 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não começam ambos por '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' não terminam ambos por '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "alguns campos do cabeçalho ainda têm o valor inicial por defeito"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "o campo `%s' falta no cabeçalho"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "erro durante a abertura de \"%s\" para leitura"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3093,7 +3097,7 @@ msgstr "fim-de-linha dentro da cadeia"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro não pode conter directivas de domínio"
@@ -3114,31 +3118,31 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr ""
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr ""
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, fuzzy, c-format
 msgid "file \"%s\" is truncated"
 msgstr "ficheiro \"%s\"truncado"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "o ficheiro \"%s\" não está no formato .mo GNU"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
@@ -3304,23 +3308,23 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3405,12 +3409,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "cuidado: nenhum elemento encontrado no cabeçalho"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
@@ -3430,7 +3434,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3462,7 +3466,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3474,7 +3478,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3494,80 +3498,80 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing não pode ser usada quando a saída\n"
 "é escrita no stdout"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "cuidado: o tipo do ficheiro `%s' com a extensão `%s' é desconhecido;\n"
 "será tentado C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3580,41 +3584,41 @@ msgid ""
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3624,15 +3628,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3640,17 +3644,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3660,7 +3664,7 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3670,7 +3674,7 @@ msgid ""
 "                                Lua, JavaScript, Vala, Desktop)\n"
 msgstr ""
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3678,7 +3682,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3688,85 +3692,90 @@ msgid ""
 "                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3774,7 +3783,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3782,52 +3791,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "entrada standard"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3836,34 +3845,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3871,7 +3880,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr ""
@@ -3970,13 +3979,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3984,7 +3993,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3992,7 +4001,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4000,7 +4009,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4008,7 +4017,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4016,22 +4025,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
diff --git a/gettext-tools/po/pt_BR.gmo b/gettext-tools/po/pt_BR.gmo
index 5116a36..15b50fc 100644
--- a/gettext-tools/po/pt_BR.gmo
+++ b/gettext-tools/po/pt_BR.gmo
diff --git a/gettext-tools/po/pt_BR.po b/gettext-tools/po/pt_BR.po
index 2859f50..8cca5df 100644
--- a/gettext-tools/po/pt_BR.po
+++ b/gettext-tools/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.7-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-12-23 10:08-0200\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -114,7 +114,7 @@ msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -192,15 +192,15 @@ msgstr "argumento source_version inválido para compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argumento target_version inválido para compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "falha ao criar \"%s\""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -225,39 +225,39 @@ msgid "%s subprocess I/O error"
 msgstr "erro de E/S no subprocesso de %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memória insuficiente"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "criação de fluxos falhou"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "escrita para subprocesso %s falhou"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "leitura do subprocesso %s falhou"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "não foi possível configurar E/S sem bloqueio para subprocesso %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "comunicação com subprocesso %s falhou"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "subprocesso de %s terminado com código de saída %d"
@@ -296,18 +296,18 @@ msgstr "\""
 msgid "setting permissions for %s"
 msgstr "definindo permissões para %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "não foi possível criar redirecionamento (pipe)"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle falhou"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "não foi possível restaurar fd %d dup2 falhou"
@@ -339,11 +339,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "O elemento raiz <%s> não possui o atributo <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Tente \"%s --help\" para mais informações.\n"
@@ -369,7 +369,7 @@ msgstr ""
 "Se nenhum argumento for fornecido, ele lê as regras de plural CLDR da\n"
 "entrada padrão.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -385,21 +385,21 @@ msgstr ""
 "  -c, --cldr                  mostra regras de plural no formato CLDR\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  exibe essa ajuda e sai\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               exibe a informação da versão e sai\n"
@@ -409,20 +409,20 @@ msgstr "  -V, --version               exibe a informação da versão e sai\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Relate erros para <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -436,10 +436,10 @@ msgstr ""
 "NÃO H� GARANTIA, à extensão permitida pela lei.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
@@ -470,18 +470,18 @@ msgid "extra operand %s"
 msgstr "operando extra %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "erro ao abrir \"%s\" para leitura"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -490,19 +490,19 @@ msgstr ""
 "em \"%s\""
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "uma especificação de formato para o argumento %u não existe em \"%s\""
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -544,8 +544,7 @@ msgstr ""
 "A string refere-se ao argumento número %u, mas ignora o argumento número %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "número de especificações de formato em \"%s\" e \"%s\" não conferem"
@@ -883,8 +882,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "especificações de formato em \"%s\" não são um subconjunto deles em \"%s\""
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
@@ -904,17 +903,17 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "Na diretiva número %u, \"%c\" não pode iniciar um nome de campo."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "Na diretiva número %u, \"%c\" não pode iniciar um argumento getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "Na diretiva número %u, \"%c\" não pode iniciar um argumento getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -922,12 +921,12 @@ msgstr ""
 "Na diretiva de número %u, não é mais permitido empilhamento em um "
 "especificador de formato."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "Na diretiva número %u, há uma diretiva de formato não terminado."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -935,13 +934,13 @@ msgstr ""
 "A string faz referência a argumentos de tanto nomes de argumentos quanto "
 "especificações de argumentos sem nome."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "A string faz referência ao argumento chamado \"%s\" em formas incompatíveis."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -949,7 +948,7 @@ msgstr ""
 "especificações de formatos em \"%s\" esperam um mapeamento, enquanto aqueles "
 "em \"%s\" esperam uma tupla"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -957,7 +956,7 @@ msgstr ""
 "especificações de formatos em \"%s\" esperam um tupla, enquanto aqueles em "
 "\"%s\" esperam um mapeamento"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -965,7 +964,7 @@ msgstr ""
 "uma especificação de formato para o argumento \"%s\", como em \"%s\", não "
 "existe em \"%s\""
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1023,7 +1022,7 @@ msgstr ""
 "O caractere que termina a diretiva de número %u não é um dígito entre 1 e 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1070,11 +1069,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            endereços para o nome da máquina\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Saída informativa:\n"
@@ -1146,12 +1145,12 @@ msgstr "o elemento raiz não é \"locatingRules\""
 msgid "at most one input file allowed"
 msgstr "no máximo um arquivo é permitido"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s são mutuamente exclusivos"
@@ -1170,7 +1169,7 @@ msgstr ""
 "Filtra as mensagens de um catálogo de tradução de acordo com seus atributos\n"
 "e manipula-os.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1180,10 +1179,10 @@ msgid ""
 msgstr ""
 "Argumentos obrigatórios para opções longas também o são para opções curtas.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Localização do arquivo de entrada:\n"
@@ -1193,10 +1192,10 @@ msgstr "Localização do arquivo de entrada:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ARQUIVO-ENTRADA             arquivo PO de entrada\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1212,24 +1211,24 @@ msgstr ""
 "Se nenhum arquivo de entrada for passado ou se for -, a entrada padrão é "
 "lida.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Localização do arquivo de saída:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=ARQUIVO   escreve a saída para o arquivo especificado\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1241,7 +1240,7 @@ msgstr ""
 "for\n"
 "especificado ou se ele for -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Seleção de mensagem:\n"
@@ -1367,9 +1366,9 @@ msgid ""
 msgstr ""
 "      --obsolete              sinônimo de --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1394,17 +1393,17 @@ msgstr ""
 "      --stringtable-input     arquivo de entrada está em sintaxe de\n"
 "                              .strings de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalhes de entrada:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1420,9 +1419,9 @@ msgstr ""
 "\" ou\n"
 "                              \"html\".\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
@@ -1430,17 +1429,17 @@ msgstr ""
 "para\n"
 "                              --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             não usa escapes de C na saída (padrão)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1448,30 +1447,30 @@ msgstr ""
 "  -E, --escape                usa escapes de C na saída, nenhum caractere\n"
 "                              estendido\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              escreve um arquivo PO mesmo se vazio\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                escreve o arquivo .po usando estilo com recuo\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           não escreve linhas \"#: nome-de-arquivo:linha"
 "\"\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1479,8 +1478,8 @@ msgstr ""
 "  -n, --add-location          gera linhas \"#: nome-de-arquivo:"
 "linha' (padrão)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1488,16 +1487,16 @@ msgstr ""
 "      --strict                escreve um arquivo .po em conformidade com\n"
 "                              com Uniforum estrito\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     escreve em arquivo .properties de Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1505,16 +1504,16 @@ msgstr ""
 "      --stringtable-output    escreve um arquivo .strings de NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NÚMERO          define a largura da página de saída\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1526,32 +1525,32 @@ msgstr ""
 "várias\n"
 "                              linhas\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           gera uma saída ordenada\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          ordena a saída por localização de arquivos\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "critério de seleção especificado impossível (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uso: %s [OPÇÃO] [ARQUIVO-ENTRADA]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1574,24 +1573,24 @@ msgstr ""
 "--use-first for especificado, eles vão ser obtidos do primeiro arquivo PO para\n"
 "defini-los.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ARQUIVO-ENTRADA ...         arquivos de entrada\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=ARQUIVO    obtém lista de arquivos de entrada de ARQUIVO\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Se o arquivo de entrada for -, a entrada padrão é lida.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1600,7 +1599,7 @@ msgstr ""
 "  -<, --less-than=NÚMERO      exibe mensagens com menos do que esse número\n"
 "                              de definições; padrão é infinito\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1609,7 +1608,7 @@ msgstr ""
 "  ->, --more-than=NÚMERO      exibe mensagens com mais do que estas várias\n"
 "                              definições, sendo 0 se não for definida\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1618,7 +1617,7 @@ msgstr ""
 "  -u, --unique                abreviação para --less-than=2, requer que\n"
 "                              apenas mensagens únicas sejam exibidas\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1627,7 +1626,7 @@ msgstr ""
 "  -P, --properties-input      arquivos de entrada estão em sintaxe \n"
 "                              .properties do Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1637,12 +1636,12 @@ msgstr ""
 "      --stringtable-input     arquivos de entrada estão em sintaxe .strings\n"
 "                              do NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOME          codificação da saída\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1651,7 +1650,7 @@ msgstr ""
 "      --use-first             usa a primeira tradução disponível para cada\n"
 "                              mensagem, não mescla várias traduções\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1660,7 +1659,7 @@ msgstr ""
 "                              cabeçalho\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1766,19 +1765,19 @@ msgstr "esta mensagem é utilizada mas não definida em %s"
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é utilizada"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "encontrado %d erro fatal"
 msgstr[1] "encontrados %d erros fatais"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "pelo menos dois arquivos devem ser especificados"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1799,7 +1798,7 @@ msgstr ""
 "do primeiro arquivo PO a defini-los. Posições de arquivos de todos\n"
 "os arquivos PO serão cumulados.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1809,7 +1808,7 @@ msgstr ""
 "várias\n"
 "                              definições, sendo 1 se não for definida\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1863,7 +1862,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                estilo de saída Uniform estrito\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "nenhum arquivo de entrada fornecido"
@@ -2048,120 +2047,120 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "saída do filtro não terminado com uma nova linha"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "o argumento %s deveria ser um caractere singular de pontuação"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "extremidade inválida: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 "nenhum arquivo de entrada deveria ser passado se %s e %s forem especificadas."
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requer especificação de um \"-d diretório\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requer especificação de um \"-l local\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s requer especificação de um \"--template modelo\""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s requer especificação de um \"-o arquivo\""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s e %s são mutuamente exclusivos em %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s é válido apenas com %s ou %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s é válido apenas com %s, %s ou %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "não foi possível localizar regras ITS para %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mensagem traduzida"
 msgstr[1] "%d mensagens traduzidas"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d tradução aproximada (fuzzy)"
 msgstr[1] ", %d traduções aproximadas (fuzzy)"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mensagem não traduzida"
 msgstr[1] ", %d mensagens não traduzidas"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uso: %s [OPÇÕES] arquivo.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Gera um catálogo de mensagens binário a partir da descrição da tradução "
 "textual.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  arquivo.po ...              arquivos de entrada\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operação:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2170,7 +2169,7 @@ msgstr ""
 "  -j, --java                  modo Java: gera uma classe ResourceBundle de "
 "Java\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2179,12 +2178,12 @@ msgstr ""
 "      --java2                 semelhante a --java, e supõe Java2 (JDK 1.2 "
 "+)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                modo C#: gera um arquivo .dll de .NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2193,52 +2192,52 @@ msgstr ""
 "      --csharp-resources      modo de recursos C#: gera um arquivo ."
 "resources de .NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   modo Tcl: gera um arquivo .msg de tcl/msgcat\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    modo Qt: gera um arquivo .qm de Qt\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr ""
 "      --desktop               modo Desktop Entry: gera um arquivo .desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "--xml                   modo XML: gera um arquivo XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                habilita modo Uniforum estrito\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Se o arquivo de saída for -, a saída é escrita na saída padrão.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Localização do arquivo de saída em modo Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RECURSO      nome do recurso\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2247,7 +2246,7 @@ msgstr ""
 "  -l, --locale=LOCALIZAÇÃO    nome da localização, podendo ser o idioma ou\n"
 "                              também idioma_PA�S\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2257,7 +2256,7 @@ msgstr ""
 "arquivo\n"
 "                              .class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2265,7 +2264,7 @@ msgstr ""
 "  -d DIRETÓRIO                diretório base de hierarquia de diretório de\n"
 "                              classes\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2277,12 +2276,12 @@ msgstr ""
 "nome do recurso, separados por um sublinhado. A opção -d é obrigatória.\n"
 "A classe é escrita sob o diretório especificado.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Localização do arquivo de saída em modo C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2291,7 +2290,7 @@ msgstr ""
 "  -d DIRETÓRIO                diretório base para arquivos .dll dependentes\n"
 "                              da localização\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2300,18 +2299,18 @@ msgstr ""
 "As opções -l e -d são obrigatórias. O arquivo .dll é escrito em um\n"
 "subdiretório do diretório especificado, cujo nome depende da localização.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Localização do arquivo de saída em modo Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRETÓRIO                diretório base de catálogos de mensagens .msg\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2320,23 +2319,23 @@ msgstr ""
 "As opções -l e -d são obrigatórias. O arquivo .msg é escrito no\n"
 "diretório especificado.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Opções de modo Desktop Entry:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "  --template=MODELO           um arquivo .desktop usado como um modelo\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRETÓRIO                diretório base de arquivos .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2347,7 +2346,7 @@ msgstr ""
 "                              adicional\n"
 "  -k, --keyword               não usa palavras-chaves padrões\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2358,27 +2357,27 @@ msgstr ""
 "arquivos de entrada são lidos do diretório ao invés dos argumentos da linha\n"
 "de comando.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Opções de modo XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=NOME         reconhece a linguagem XML especificada\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=MODELO           um arquivo XML usado como um modelo\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretação do arquivo de entrada:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2389,14 +2388,14 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          verifica strings de formato dependente da\n"
 "                              localização\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2405,7 +2404,7 @@ msgstr ""
 "      --check-header          verifica presença e conteúdo da mensagem\n"
 "                              de cabeçalho\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2415,7 +2414,7 @@ msgstr ""
 "domínios\n"
 "                              e a opção --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2424,7 +2423,7 @@ msgstr ""
 "  -C, --check-compatibility   verifica se o GNU msgfmt se comporta como\n"
 "                              X/Open msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2435,12 +2434,12 @@ msgstr ""
 "                              verifica a presença de aceleradores de\n"
 "                              teclado para itens de menu\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             usa entradas aproximadas na saída\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2448,7 +2447,7 @@ msgstr ""
 "  -a, --alignment=NÚMERO      alinha strings em NÚMERO bytes (padrão: %d)\n"
 
 # big e little são as opções de ORDEM-DE-BYTES, portanto não traduza.
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2462,92 +2461,92 @@ msgstr ""
 "plataforma)\n"
 
 # "binary" de binário (compilado, .mo), e não de executável
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               arquivo binário não vai incluir a tabela hash\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            imprime estatísticas sobre traduções\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta o nível de detalhamento\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "aviso: cabeçalho do arquivo PO faltando ou inválido\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "aviso: conversão de codificação de caracteres não vai funcionar\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "aviso: cabeçalho de arquivo PO como tradução aproximada (fuzzy)\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "aviso: versões mais antigas do msgfmt vão dar um erro nisso\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nome do domínio \"%s\" não é válido como nome de arquivo: será usado um "
 "prefixo"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "diretiva \"domain %s\" ignorada"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "mensagem \"msgstr\" vazia ignorada"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "mensagem \"msgstr\" aproximada (fuzzy) ignorada"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s não existe"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existe, mas não pode ler"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro ao ler \"%s\""
@@ -2804,14 +2803,14 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traduções em português brasileiro para o pacote %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "o conjunto de caracteres presente \"%s\" não é um nome de codificação "
 "portável"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2835,7 +2834,7 @@ msgstr ""
 "domínio \"%s\" no arquivo de entrada \"%s\" não contém uma entrada de "
 "cabeçalho com uma especificação de conjunto de caracteres"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
@@ -2843,7 +2842,7 @@ msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "aviso: "
@@ -2940,26 +2939,26 @@ msgstr ""
 "Saída de \"%s\" pode estar incorreta.\n"
 "Uma solução possível é definir LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "expressões de plural podem produzir valores negativos"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, mas uma expressão plural pode produzir valores tão grandes "
 "quanto %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "expressão de plural pode produzir divisão por zero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "expressão de plural pode produzir sobrecarga de inteiro"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2967,51 +2966,51 @@ msgstr ""
 "expressão de plural pode produzir exceções aritméticas, possivelmente "
 "divisão por zero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Tente usar o seguinte, válido para %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "catálogo de mensagens possui traduções em forma de plural"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "mas o cabeçalho não possui um atributo \"plural=EXPRESSÃO\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "mas o cabeçalho não possui um atributo \"nplurals=INTEIRO\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "valor de nplurals inválido"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "valor de plural inválido"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "mas algumas mensagens possuem apenas uma forma de plural"
 msgstr[1] "mas algumas mensagens possuem apenas %lu formas de plural"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "mas algumas mensagens possuem uma forma de plural"
 msgstr[1] "mas algumas mensagens possuem %lu formas de plural"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -3019,90 +3018,95 @@ msgstr ""
 "catálogo de mensagens possui traduções em forma de plural, mas o cabeçalho "
 "não possui \"Plural-Forms: nplurals=INTEIRO; plural=EXPRESSÃO;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "\"msgid\" e \"msgid_plural\" não começam com \"\\n\"'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "\"msgid\" e \"msgstr[%u]\" não começam com \"\\n\"'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "\"msgid\" e \"msgstr\" não começa com \"\\n\"'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "\"msgid\" e \"msgid_plural\" não terminam com \"\\n\"'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "\"msgid\" e \"msgstr[%u]\" não terminam com \"\\n\"'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "\"msgid\" e \"msgstr\" não terminam com \"\\n\"'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "manipulação de plural é uma extensão do GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr não possui a marca de acelerador de teclado \"%c\""
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr possui marcas de aceleradores de teclado \"%c\" demais"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "campo de cabeçalho \"%s\" ainda possui o valor inicial padrão\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "campo de cabeçalho \"%s\" faltando no cabeçalho\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "elipse ASCII (\"...\") ao invés de Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "espaço antes de elipse encontrado nas strings visíveis de usuário"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Aspas duplas ASCII usadas ao invés de Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Aspa simples ASCII usada ao invés de Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, fuzzy, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "elipse ASCII (\"...\") ao invés de Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: entrada não é válida na codificação \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: erro ao converter da codificação \"%s\" para \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "arquivo de entrada não contém uma entrada cabeçalho com uma especificação de "
 "codificação de caracteres"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3111,7 +3115,7 @@ msgstr ""
 "Não foi possível converter de \"%s\" para \"%s\". %s depende do iconv(),mas "
 "iconv() não tem suporte a esta conversão."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3120,8 +3124,8 @@ msgstr ""
 "Conversão de \"%s\" para \"%s\" introduz duplicatas: algumas msgids "
 "diferentes ficaram equal."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3557,7 +3561,7 @@ msgstr "fim de linha dentro de string"
 msgid "context separator <EOT> within string"
 msgstr "separador de contexto <EOT> dentro de string"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este arquivo parece não conter diretivas de domínio"
@@ -3578,31 +3582,31 @@ msgstr "nome de grupo não terminado"
 msgid "invalid non-blank character"
 msgstr "caractere não-vazio inválido"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "faltando \"=\" após \"%s\""
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "linha não-vazia inválida"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "arquivo \"%s\" está truncado"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "arquivo \"%s\" contém string não terminada em NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "arquivo \"%s\" não está no formato .mo de GNU"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "arquivo \"%s\" contém string não terminada em NUL, em %s"
@@ -3784,25 +3788,25 @@ msgstr "compilação de classe C# falhou, por favor tente --verbose"
 msgid "compilation of C# class failed"
 msgstr "compilação de classe C# falhou"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "erro ao abrir o arquivo \"%s\" para gravação"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "não é um nome de classe Java válido: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "compilação de classe Java falhou, por favor tente --verbose ou tente definir "
 "$JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "compilação de classe Java falhou, por favor tente definir $JAVAC"
@@ -3913,12 +3917,12 @@ msgstr ""
 "mas o formato de catálogo de mensagens Tcl não tem suporte a manipular "
 "plural\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: aviso: string não terminada"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: aviso: expressão regular não terminada"
@@ -3938,7 +3942,7 @@ msgstr "%s:%d: aviso: constante de caractere não terminada"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: string literal não terminada"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Por favor, especifique a codificação fonte por meio de --from-code"
 
@@ -3978,7 +3982,7 @@ msgstr ""
 "%s:%d: Sequência multi-byte incompleta ao finado da linha.\n"
 "Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: falha no iconv"
@@ -3992,7 +3996,7 @@ msgstr ""
 "%s:%d: Sequência multi-byte inválida.\n"
 "Por favor, especifique a codificação fonte por meio de --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: aviso: caractere Unicode inválido"
@@ -4012,38 +4016,38 @@ msgstr "%s:%d: aviso: \")\" encontrado quando \"}\" era esperado"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: aviso: \"}\" encontrado quando \")\" era esperado"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "\"%s\" não é um nome de codificação válida. Usando ASCII.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "verificação de sintaxe \"%s\" desconhecida"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "tipo de fim de sentença \"%s\" desconhecido"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing não pode ser usada enquanto a saída é escrita na saída padrão"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext não pode funcionar sem as teclas para procurar"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "aviso: arquivo de regras ITS \"%s\" não existe"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -4051,18 +4055,18 @@ msgstr ""
 "aviso: arquivo de regras ITS \"%s\" não existe; verifique sua instalação "
 "gettext"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "aviso: arquivo \"%s\", extensão \"%s\" é desconhecida; tentarei C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrai strings traduzíveis dos arquivos de entrada passados.\n"
 
 # "messages.po" é, de fato, um nome de um arquivo; não mude isso.
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4071,13 +4075,13 @@ msgstr ""
 "  -d, --default-domain=NOME   usa NOME.po para saída (ao invés de messages."
 "po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=ARQUIVO        escreve a saída para o arquivo especificado\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4086,12 +4090,12 @@ msgstr ""
 "                              diretório DIR\n"
 
 # Não é idioma. É linguagem de programação (C, C# etc.), de formatação (HTML etc.), de scripts (Shell script) e por aí vai.
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Escolha da linguagem do arquivo de entrada:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4114,12 +4118,12 @@ msgstr ""
 "Lua,\n"
 "                                 JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abreviação para --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4128,7 +4132,7 @@ msgstr ""
 "Por padrão, a linguagem é adivinhada dependendo da extensão do nome do\n"
 "arquivo de entrada.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4137,24 +4141,24 @@ msgstr ""
 "      --from-code=NOME        codificação dos arquivos de entrada\n"
 "                                (exceto para Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Po padrão, supõe-se que os arquivos de entrada estejam em ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         junta mensagens com arquivo existente\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=arquivo.po\n"
 "                              entradas do ARQUIVO.po não são extraídas\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4173,18 +4177,18 @@ msgstr ""
 "                              as linhas de palavras-chaves no arquivo de "
 "saída\n"
 
-#: src/xgettext.c:1117
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NOME            realiza verificação de sintaxe nas mensagens\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
 "                                 quote-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4195,17 +4199,17 @@ msgstr ""
 "                                (single-space, que é o padrão, \n"
 "                                 ou double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opções específicas de linguagens:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrai todas as strings\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4221,7 +4225,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4237,7 +4241,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4249,7 +4253,7 @@ msgstr ""
 "argumento\n"
 "                              de número ARG da palavra-chave PALAVRA\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4266,39 +4270,49 @@ msgstr ""
 "                                Lua, JavaScript, Vala)\n"
 
 # Trigraphs são seqüências de três caracteres (introduzidos por dois pontos de interrogação consecutivos) que o compilador substitui com seus caracteres de pontuação correspondente
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             entende trigraphs de ANSI C para entrada\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (apenas linguagens C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=ARQUIVO           aplica regras ITS do ARQUIVO\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (apenas a linguagem C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconhece strings no formato Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (apenas a linguagem C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   reconhece as strings de formato KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 reconhece strings no formato Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4306,23 +4320,18 @@ msgstr ""
 "      --debug                 resultado de reconhecimento de string de\n"
 "                              formato mais detalhado\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     escreve em um arquivo .properties de Java\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=ARQUIVO           aplica regras ITS do ARQUIVO\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               escreve comentários em itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
@@ -4330,7 +4339,7 @@ msgstr ""
 "                              define o detentor dos direitos autorais\n"
 "                              na saída\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4338,19 +4347,19 @@ msgstr ""
 "      --foreign-user          omite direitos autorais da FSF na saída para\n"
 "                              usuários de fora\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACOTE   define o nome do pacote na saída\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSÃO\n"
 "                              define a versão do pacote na saída\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4359,7 +4368,7 @@ msgstr ""
 "                              define o endereço para relatar erros de\n"
 "                              msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4371,7 +4380,7 @@ msgstr ""
 "de\n"
 "                              msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4383,7 +4392,7 @@ msgstr ""
 "de\n"
 "                              msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4392,31 +4401,31 @@ msgstr ""
 "Um argumento de --flag não possui a sintaxe <palavra-chave>:<argnum>:"
 "[pass-]<flag>: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "entrada padrão"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Caractere não-ASCII em %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Comentário não ASCII em ou antes de %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "String não-ASCII em %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: aviso: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4425,7 +4434,7 @@ msgstr ""
 "Apesar de ser usado em uma posição de string de formato, o %s não é uma "
 "string de formato válida de %s. Motivo: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4434,7 +4443,7 @@ msgstr ""
 "Apesar de estar declarada assim, o %s não é uma string de formato válida de "
 "%s. Motivo: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4449,7 +4458,7 @@ msgstr ""
 "Por favor, considere usar uma string de formato com argumentos nomeados,\n"
 "e um mapeamento ao invés de uma tupla de argumentos.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4459,28 +4468,28 @@ msgstr ""
 "gettext(\"\") retorna a entrada de cabeçalho com\n"
 "informações meta, e não a string vazia.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "especificação de argumento ambíguo para a palavra-chave \"%.*s\""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "aviso: faltando contexto para palavra-chave \"%.*s\""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "aviso: faltando contexto para argumentos plurais de palavra-chave '%.*s'"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "contexto não confere para formas singular e plural"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4492,7 +4501,7 @@ msgstr ""
 "especifique lá a variável MSGID_BUGS_ADDRESS; Senão por favor\n"
 "especifique uma opção de linha de comando --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "idioma \"%s\" desconhecido"
@@ -4603,7 +4612,7 @@ msgstr "%s:%d: interpolação (\"\\L\") inválida de caractere de 8bit \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolação (\"\\U\") inválida de caractere de 8bit \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4611,7 +4620,7 @@ msgstr ""
 "Por favor, especifique a codificação fonte por meio de --from-code ou um\n"
 "comentário, como especificado em http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4623,7 +4632,7 @@ msgstr ""
 "ou um comentário, como especificado em\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4635,7 +4644,7 @@ msgstr ""
 "ou um comentário, como especificado em\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4647,7 +4656,7 @@ msgstr ""
 "ou um comentário, como especificado em\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4659,7 +4668,7 @@ msgstr ""
 "ou um comentário, como especificado em\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4671,22 +4680,22 @@ msgstr ""
 "ou um comentário, como especificado em\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Codificação desconhecida \"%s\". Procedendo com ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definição de string inválida"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: faltando número após #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expressão de string inválida"
diff --git a/gettext-tools/po/ro.gmo b/gettext-tools/po/ro.gmo
index 49105d9..6d88975 100644
--- a/gettext-tools/po/ro.gmo
+++ b/gettext-tools/po/ro.gmo
diff --git a/gettext-tools/po/ro.po b/gettext-tools/po/ro.po
index b627799..bebe31d 100644
--- a/gettext-tools/po/ro.po
+++ b/gettext-tools/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2003-11-23 11:43+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -114,7 +114,7 @@ msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscutã"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -192,15 +192,15 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "eroare în crearea \"%s\""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -227,39 +227,39 @@ msgid "%s subprocess I/O error"
 msgstr "eroare I/O a subprocesului %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "memorie plinã"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "scrierea în subprocesul %s eºuatã"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "citirea din subprocesul %s a eºuat"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "nu se poate seta I/O neblocant pentru subprocesul %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "comunicaþia cu subprocesul %s a eºuat"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "subprocesul %s s-a terminat cu cod de ieºire %d"
@@ -298,18 +298,18 @@ msgstr ""
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "nu se poate crea legãtura(pipe)"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle a eºuat"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "nu se poate crea fiºierul de ieºire(output) \"%s\""
@@ -341,11 +341,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Încercaþi `%s --help' pentru mai multe informaþii.\n"
@@ -365,7 +365,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -380,21 +380,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  afiºeazã acest ajutor ºi iese\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  afiºeazã acest ajutor ºi iese\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               afiºeazã informaþii despre versiune ºi iese\n"
@@ -404,20 +404,20 @@ msgstr "  -V, --version               afiºeazã informaþii despre versiune ºi ies
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Raportaþi bug-urile la <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -427,10 +427,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
@@ -461,18 +461,18 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "eroare în timpul deschiderii \"%s\" pentru citire"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -481,19 +481,19 @@ msgstr ""
 "'msgid'"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "o specificaþie de format pentru argumentul %u nu existã în '%s'"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -537,8 +537,7 @@ msgstr ""
 "ªirul are referire la argumentul numãrul %u dar ignorã argumentul numãrul %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "numãrul de specificaþii de formatare din 'msgid' ºi '%s' este diferit"
@@ -869,8 +868,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "specificaþiile de format din '%s' nu sunt subset al acelora din 'msgid'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "o specificare de format pentru argumentul '%s' nu existã în '%s'"
@@ -889,29 +888,29 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "În directiva numãrul %u, '%c' nu este urmat de un digit."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "În numãrul de directivã %u, '{' nu este urmat de un numãr de argument."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "În directiva numãrul %u, '%c' nu este urmat de un digit."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 "În numãrul de directivã %u, marcajele(flags) nu sunt admise înainte de '%c'."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, fuzzy, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "În directiva numãrul %u parametrul %d este negativ."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -919,12 +918,12 @@ msgstr ""
 "ªirul se referã la argumente atât prin numele argumentelor cât ºi prin "
 "specificaþii de argument nenominalizate."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "ªirul se referã la argumentul numit '%s' în moduri incompatibile."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -932,7 +931,7 @@ msgstr ""
 "specificaþiile de format din 'msgid' aºteaptã o mapare, acelea din '%s' "
 "aºteaptã altceva(tuple)"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -940,7 +939,7 @@ msgstr ""
 "specificaþiile de formatare din 'msgid' aºteaptã altceva (tuple), acelea din "
 "'%s' aºteaptã o mapare"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
@@ -948,7 +947,7 @@ msgstr ""
 "specificarea de formatare pentru argumentul '%s', precum în '%s' nu existã "
 "în 'msgid'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1004,7 +1003,7 @@ msgstr ""
 "Caracterul care terminã directiva numãrul %u nu este un digit între 1 ºi 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1052,11 +1051,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      adresele pentru numele de host\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Ieºire(output) informativã:\n"
@@ -1128,12 +1127,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "cel mult un fiºier de intrare(input) este permis"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ºi %s se exclud reciproc"
@@ -1152,7 +1151,7 @@ msgstr ""
 "Filtreazã mesajele unui catalog de traduceri potrivit atributelor lor,\n"
 "ºi manipuleazã atributele.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1163,10 +1162,10 @@ msgstr ""
 "Parametrii obligatorii la opþiunile lungi sunt obligatorii ºi la opþiunile "
 "scurte.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Locaþie fiºier intrare(input):\n"
@@ -1176,10 +1175,10 @@ msgstr "Locaþie fiºier intrare(input):\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FIªIER_INTRARE                   fiºier de intrare(input) PO\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1195,24 +1194,24 @@ msgstr ""
 "Dacã nu este dat nici un fiºier de intrare sau este -, se va citi "
 "intrarea(input) standard.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Locaþie fiºier ieºire(output):\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FIªIER      scrie output-ul în fiºierul specificat\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1224,7 +1223,7 @@ msgstr ""
 "fiºier\n"
 "de ieºire(output) sau dacã acesta este -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selecþie mesaje:\n"
@@ -1342,9 +1341,9 @@ msgstr ""
 "      --obsolete              sinonim pentru --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1369,17 +1368,17 @@ msgstr ""
 "      --stringtable-input     fiºierul de intrare(input) este în sintaxã \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalii de output:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1388,24 +1387,24 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             nu foloseºte escape-uri C în output\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1413,28 +1412,28 @@ msgstr ""
 "  -E, --escape                foloseºte escape-uri C în output, fãrã "
 "caractere extinse\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              scrie fiºierul PO chiar dacã e gol\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                scrie fiºierul .po folosind stil indentat\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           nu scrie liniile '#: filename:line'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1442,39 +1441,39 @@ msgstr ""
 "  -n, --add-location          genereazã liniile '#: filename:"
 "line' (implicit)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                scrie strict fiºiere conforme Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     scrie un fiºier .properties Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output     scrie un fiºier .strings NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr " -w, --width=NUMÃR          setare lãþime output paginã\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1485,32 +1484,32 @@ msgstr ""
 "                              decât lãþimea paginii de output,în câteva "
 "linii\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genereazã output sortat\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          sorteazã output-ul dupã locaþia fiºierului\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "criteriu de selecþie specificat imposibil (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Folosire: %s [OPÞIUNE] [FIªIER_INTRARE]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1534,26 +1533,26 @@ msgstr ""
 "este specificat --use-first, caz în care vor fi preluate din primul fiºier PO pentru\n"
 "a fi definite. Pozitþiile din fiºier din toate fiºierele PO vor fi cumulate.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FIªIER_INTRARE ...                  fiºiere de intrare(input)\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=FIªIER          obþine lista de fiºiere de intrare din "
 "FIªIER\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 "Dacã fiºierul de intrare este -, se va citi intrarea(input) standard.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1564,7 +1563,7 @@ msgstr ""
 "este\n"
 "                                 infinit\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1574,7 +1573,7 @@ msgstr ""
 "                                 definiþii, dacã nu este setat implicit este "
 "0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1583,7 +1582,7 @@ msgstr ""
 "  -u, --unique                   scurtãturã pentru --less-than=2, solicitã\n"
 "                                 ca doar mesajele unice sã fie tipãrite\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1592,7 +1591,7 @@ msgstr ""
 "  -P, --properties-input     fiºierele de intrare(input) sunt în sintaxã ."
 "properties Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1602,13 +1601,13 @@ msgstr ""
 "      --stringtable-input     fiºierele de intrare(input) sunt în sintaxã \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 " -t, --to-code=NUME             codarea(encoding) pentru ieºire(output)\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1619,14 +1618,14 @@ msgstr ""
 "                                 fiecare mesaj, nu îmbinã mai multe "
 "traduceri\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1736,19 +1735,19 @@ msgstr "acest mesaj este folosit dar nu ºi definit în %s"
 msgid "warning: this message is not used"
 msgstr "avertisment: acest mesaj nu este folosit"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "s-a gãsit %d eroare fatalã"
 msgstr[1] "s-au gãsit %d erori fatale"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "cel puþin douã fiºiere trebuie specificate"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1769,7 +1768,7 @@ msgstr ""
 "comentariile ºi comentariile extrase vor fi pãstrate, dar doar dacã sunt definite\n"
 "în primul fiºier PO.  Pozitþiile din fiºier din toate fiºierele PO vor fi cumulate.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1779,7 +1778,7 @@ msgstr ""
 "                                 definiþii, dacã nu este setat implicit este "
 "1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1833,7 +1832,7 @@ msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                   scrie strict fiºiere conforme Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "nu este furnizat nici un fiºier de intrare"
@@ -2022,120 +2021,120 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "fiºierul \"%s\" conþine un ºir terminat non NUL"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentul lui %s ar trebui sã fie un singur caracter de punctuaþie"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, fuzzy, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr ""
 "Dacã nu este dat nici un fiºier de intrare sau este -, se va citi "
 "intrarea(input) standard.\n"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s necesitã specificarea \"-d director\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s necesitã specificarea \"-l localizare\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, fuzzy, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s necesitã specificarea \"-l localizare\""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, fuzzy, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s necesitã specificarea \"-l localizare\""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s ºi %s se exclud reciproc"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s e valid doar cu %s sau cu %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s e valid doar cu %s sau cu %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "nu se poate crea fiºierul de ieºire(output) \"%s\""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mesaj tradus"
 msgstr[1] "%d mesaje traduse"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traducere aproximativã(fuzzy)"
 msgstr[1] ", %d traduceri aproximative(fuzzy)"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mesaj netradus"
 msgstr[1] ", %d mesaje netraduse"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Folosire: %s [OPÞIUNE] numefiºier.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genereazã un catalog binar de mesaje din descriere de traducere textualã\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  numefiºier.po ...             fiºiere de intrare(input)\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mod de operare:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2144,7 +2143,7 @@ msgstr ""
 "  -j, --java                  Mod Java: genereazã o clasã Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2153,65 +2152,65 @@ msgstr ""
 "      --java2                 precum --java, ºi presupune Java2 (JDK 1.2 sau "
 "ulterior)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, fuzzy, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Mod tcl: genereazã un fiºier tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, fuzzy, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                   Mod Qt: genereazã un fiºier .qm Qt\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                activeazã modul strict Uniforum\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Dacã fiºierul de ieºire(output) este -, output-ul este scris la ieºirea "
 "standard.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Locaþie fiºier output în mod Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURSÃ     nume resursã\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2220,7 +2219,7 @@ msgstr ""
 "  -l, --locale=LOCALIZARE         nume localizare, fie limbã, "
 "fie                                                 limbã_ÞARÃ\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, fuzzy, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2229,14 +2228,14 @@ msgstr ""
 "      --tcl                mod Tcl: intrarea(input) este un fiºier tcl/"
 "msgcat .msg\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al ierarhiei directoarelor\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2249,12 +2248,12 @@ msgstr ""
 "separatã de liniuþã_jos.  Opþiunea -d este obligatorie.  Clasa este\n"
 "scrisã în directorul specificat.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Locaþie fiºier output în mod Tcl:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, fuzzy, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2262,7 +2261,7 @@ msgid ""
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al ierarhiei directoarelor\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, fuzzy, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2272,19 +2271,19 @@ msgstr ""
 "directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Locaþie fiºier output în mod Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al cataloagelor de mesaje ."
 "msg\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2294,24 +2293,24 @@ msgstr ""
 "directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, fuzzy, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 "  -d DIRECTOR                 directorul de bazã al cataloagelor de mesaje ."
 "msg\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2322,7 +2321,7 @@ msgstr ""
 "cuvintelor_cheie\n"
 "                                  implicite)\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2330,27 +2329,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretare fiºier de intrarea(input):\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2361,13 +2360,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          verificã ºirurile format dependent de limbaj\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2375,7 +2374,7 @@ msgid ""
 msgstr ""
 "      --check-header          verificã prezenþa ºi conþinutul header-ului\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2385,7 +2384,7 @@ msgstr ""
 "directivele\n"
 "                                de domenii ºi opþiunea --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2394,7 +2393,7 @@ msgstr ""
 "  -C, --check-compatibility   verificã dacã GNU msgfmt se comportã ca X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2405,14 +2404,14 @@ msgstr ""
 "tastaturã\n"
 "                                pentru elementele meniului\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             foloseºte intrãri parþial traduse la "
 "ieºire(output)\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2420,7 +2419,7 @@ msgstr ""
 "  -a, --alignment=NUMÃR      aliniazã ºirurile la NUMÃR octeþi (implicit: "
 "%d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2429,93 +2428,93 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               fiºierul binar nu va include tabela de hash\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            afiºeazã statistici despre traduceri\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               mãreºte nivelul de detaliere\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "avertisment: headerul fiºierului PO lipseºte sau este invalid\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "avertisment: conversia setului de caractere nu va funcþiona\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "avertisment: headerul fiºierului PO este neclar(fuzzy)\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "avertisment: versiunile mai vechi ale msgfmt ar putea aici raporta o eroare\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "numele de domeniu \"%s\" nu este potrivit ca nume fiºier"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "numele de domeniu \"%s\" nu este potrivit ca nume de fiºier: se va utiliza "
 "prefix"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "directiva `domain %s' ignoratã"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "intrarea `msgstr' vidã ignoratã"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "intrarea `msgstr' neclarã(fuzzy) ignoratã"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avertisment: fiºierul sursã conþine traduceri aproximative(fuzzy)"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "eroare în timpul citirii \"%s\""
@@ -2754,14 +2753,14 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traducerea în limba românã pentru pachetul %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "setul de caractere prezent \"%s\" nu este un nume de codare(encoding) "
 "portabil"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
@@ -2785,7 +2784,7 @@ msgstr ""
 "domeniu \"%s\" din fiºierul de intrare `%s' nu conþine un header cu o "
 "specificaþie de set de caractere"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
@@ -2793,7 +2792,7 @@ msgstr ""
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "avertisment: "
@@ -2886,78 +2885,78 @@ msgstr ""
 "Output-ul lui '%s' poate fi incorect.\n"
 "O posibilã soluþie(workaround) este setarea LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "expresiile plurale pot produce valori negative"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu dar expresiile plurale pot produce valori pânã la %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "expresia pluralã poate produce împãrþire la zero"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "plural expression can produce depãºire(overflow) de întreg(integer)"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "expresia pluralã poate produce excepþii aritmetice, posibil împãrþire la zero"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Încercaþi sã folosiþi urmãtoarele, valide pentru %s:\n"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "catalogul de mesaje are traduceri în forme plurale..."
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...dar header-ului îi lipseºte atributul \"plural=EXPRESSION\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...dar header-ului îi lipseºte atributul \"plural=INTEGER\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "valoare nplurals invalidã"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "expresie pluralã invalidã"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...dar câteva mesaje au doar o singurã formã pluralã"
 msgstr[1] "...dar câteva mesaje au doar %lu forme plurale"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...dar câteva mesaje au o singurã formã pluralã"
 msgstr[1] "...dar câteva mesaje au %lu forme plurale"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2965,95 +2964,100 @@ msgstr ""
 "catalogul de mesaje are traduceri de formã pluralã, dar îi lipseºte un "
 "header cu\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgid_plural' nu încep amândouã cu '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr[%u]' nu încep amândouã cu '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr' nu încep amândouã cu '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgid_plural' nu se terminã amândouã cu '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr[%u]' nu se terminã amândouã cu '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "intrãrile `msgid' ºi `msgstr' nu se terminã amândouã cu '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "manipularea de plurale este o extensie a GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr nu are marcaj de accelerator de tastaturã '%c'"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr are prea multe marcaje de acceleratoare tastaturã '%c'"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr ""
 "câteva câmpuri de header ar trebui sã aibã valoare implicitã iniþialã\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "câmpul header '%s' lipseºte din header\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "eroare în timpul deschiderii \"%s\" pentru citire"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "fiºierul de intrare(input) nu conþine un header cu specificaþia unui set de "
 "caractere"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3062,7 +3066,7 @@ msgstr ""
 "Nu se poate converti din \"%s\" în \"%s\". %s se bazeazã pe inconv(), iar "
 "iconv() nu suportã aceastã conversie."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3071,8 +3075,8 @@ msgstr ""
 "Conversia din \"%s\" în \"%s\" introduce duplicate: anumite msgid-uri "
 "diferite devin egale."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3515,7 +3519,7 @@ msgstr "sfârºit de linie în ºir"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "acest fiºier poate sã nu conþinã directive de domeniu"
@@ -3537,32 +3541,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "lipseºte numele de filtru"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "valoare nplurals invalidã"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "fiºierul \"%s\" este trunchiat"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "fiºierul \"%s\" conþine un ºir terminat non NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fiºierul \"%s\" nu este în formatul GNU .mo"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "fiºierul \"%s\" conþine un ºir terminat non NUL, la %s"
@@ -3753,25 +3757,25 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr "comunicaþia cu subprocesul %s a eºuat"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "eroare în deschiderea \"%s\" pentru scriere"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nu este un nume valid de clasã Java: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "compilarea clasei Java a eºuat, vã rugãm încercaþi --verbose sau setaþi "
 "$JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3894,12 +3898,12 @@ msgstr ""
 "catalogul de mesaje are traduceri în formã pluralã,\n"
 "dar formatul catalogului de mesaje Tcl nu suportã manipularea pluralelor\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: avertisment: ºir neterminat"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avertisment: expresie regulatã neterminatã"
@@ -3919,7 +3923,7 @@ msgstr "%s:%d: avertisment: constantã caracter neterminatã"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avertisment: ºir literal neterminat"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3962,7 +3966,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "eroare iconv"
@@ -3976,7 +3980,7 @@ msgstr ""
 "ªir non-ASCII la %s%s.\n"
 "Vã rugãm specificaþi sursa codãrii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: avertisment: caracter Unicode invalid"
@@ -3996,56 +4000,56 @@ msgstr "%s:%d: avertisment: s-a gãsit ')' unde se aºtepta '}'"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avertisment: s-a gãsit '}' unde se aºtepta ')'"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "limbajul `%s' este necunoscut"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing nu poate fi folosit când output-ul este scris la stdout"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nu poate funcþiona fãrã cuvinte cheie dupã care sã caute"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "avertisment: fiºierul `%s' extensia `%s' este necunoscut(ã); se va încerca C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Extrage ºirurile traductibile din fiºierele de intrare(input) specificate.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4054,13 +4058,13 @@ msgstr ""
 "  -d, --default-domain=NUME      foloseºte NUME.po pentru output \n"
 "(în loc de messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FIªIER              scrie output-ul în fiºierul specificat\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4069,12 +4073,12 @@ msgstr ""
 "în \n"
 "directorul DIR\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Alegerea limbajul fiºierelor de intrare(input):\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4093,12 +4097,12 @@ msgstr ""
 "                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      scurtãturã pentru --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4108,7 +4112,7 @@ msgstr ""
 "intrare \n"
 "(input)\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4117,25 +4121,25 @@ msgstr ""
 "      --from-code=NUME        codare pentru fiºierele de intrare(input)\n"
 "                                (exceptând Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Implicit fiºierele de intrare(input) sunt presupuse a fi în ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            alãturã mesajele fiºierului existent\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FIªIER.po     intrãrile din FIªIER.po nu vor fi "
 "extrase\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4150,15 +4154,15 @@ msgstr ""
 "                                 cuvinte cheie) în fiºierul de "
 "ieºire(output)\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4166,17 +4170,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opþiuni specifice limbajului:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              extrage toate ºirurile\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4189,7 +4193,7 @@ msgstr ""
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                Tcl, Perl, PHP, GCC-sursã, Glade)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4202,7 +4206,7 @@ msgstr ""
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                Tcl, Perl, PHP, GCC-sursã, Glade)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4213,7 +4217,7 @@ msgstr ""
 "argumentul\n"
 "                              numãrul ARG al cuvântului cheie CUVÂNT\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4226,7 +4230,7 @@ msgstr ""
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                YCP, Tcl, Perl, PHP, GCC-sursã)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
@@ -4234,32 +4238,44 @@ msgstr ""
 "pentru intrare\n"
 "                                     (input)\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (doar limbajele C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=FIªIER          obþine lista de fiºiere de intrare din "
+"FIªIER\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (doar limbajul C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recunoaºte formatul ºirurilor Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (doar limbajul C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    recunoaºte formatul ºirurilor Qt\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    recunoaºte formatul ºirurilor Qt\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4267,32 +4283,25 @@ msgstr ""
 "      --debug                    rezultat mai detaliat al recunoaºterii "
 "formatstring\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     scrie un fiºier .properties Java\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=FIªIER          obþine lista de fiºiere de intrare din "
-"FIªIER\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 "      --indent                   scrie fiºierul .po folosind stil indentat\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=ªIR  seteazã deþinãtorul copyright-ului la "
 "ieºire(output)\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4300,19 +4309,19 @@ msgstr ""
 "      --foreign-user          omite copyright FSF la ieºire pentru user "
 "strãin(foreign)\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --copyright-holder=ªIR  seteazã deþinãtorul copyright-ului la "
 "ieºire(output)\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4320,7 +4329,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@ADRESÃ  seteazã adresa de reportare a\n"
 "bug-urilor msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4330,7 +4339,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=ªIR]  foloseºte ªIR sau \"\" ca prefix pentru "
 "intrãrile msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4340,7 +4349,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=ªIR]  foloseºte ªIR sau \"\" ca suefix pentru "
 "intrãrile msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4348,31 +4357,31 @@ msgid ""
 msgstr ""
 "Un argument --flag nu are sintaxa <keyword>:<argnum>:[pass-]<flag> : %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "intrare(input) standard"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avertisment: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4381,7 +4390,7 @@ msgstr ""
 "Deºi este folosit într-o poziþie de format a ºirului, %s nu este un format\n"
 "al ºirului valid %s. Motiv: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4390,7 +4399,7 @@ msgstr ""
 "Deºi este declarat astfel, %s nu este un format al ºirului valid %s: Motiv:\n"
 "%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4399,7 +4408,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4409,27 +4418,27 @@ msgstr ""
 "gettext(\"\") returneazã header-ul cu informaþii\n"
 "meta, nu cu ºirul vid.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4442,7 +4451,7 @@ msgstr ""
 "aici variabila MSGID_BUGS_ADDRESS; în caz contrar\n"
 "vã rugãm specificaþi optiunea --msgid-bugs-address în linia de comandã.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "limbajul `%s' este necunoscut"
@@ -4555,13 +4564,13 @@ msgstr "%s:%d: interpolare invalidã (\"\\L\") a caracterului pe 8biþi  \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolare invalidã (\"\\U\") a caracterului pe 8biþi  \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4569,7 +4578,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4577,7 +4586,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4585,7 +4594,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4593,7 +4602,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4601,22 +4610,22 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: definiþie invalidã de ºir"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: lipseºte numãr dupã #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expresie ºir invalidã"
diff --git a/gettext-tools/po/ru.gmo b/gettext-tools/po/ru.gmo
index 1319132..5b523b5 100644
--- a/gettext-tools/po/ru.gmo
+++ b/gettext-tools/po/ru.gmo
diff --git a/gettext-tools/po/ru.po b/gettext-tools/po/ru.po
index 55113f8..a5831a3 100644
--- a/gettext-tools/po/ru.po
+++ b/gettext-tools/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2014-11-19 09:30+0200\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -112,7 +112,7 @@ msgid "Unknown system error"
 msgstr "�еизве�тна� �и�темна� ошибка"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -190,15 +190,15 @@ msgstr "неправильный аргумент source_version дл� compile_
 msgid "invalid target_version argument to compile_java_class"
 msgstr "неправильный аргумент target_version дл� compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ошибка при �оздании «%s»"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -224,40 +224,40 @@ msgid "%s subprocess I/O error"
 msgstr "ошибка ввода/вывода в дочернем проце��е %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "пам�ть и�черпана"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "ошибка при �оздании нитей"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "ошибка при запи�и в дочерний проце�� %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "ошибка при чтении из дочернего проце��а %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 "невозможно организовать неблокирующий ввод/вывод дл� дочернего проце��а %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "ошибка при попытке �в�зи � дочерним проце��ом %s"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "дочерний проце�� %s завершил�� � выходным кодом %d"
@@ -296,18 +296,18 @@ msgstr "»"
 msgid "setting permissions for %s"
 msgstr "у�тановка прав до�тупа дл� %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "невозможно �оздать канал"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "ошибка при _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "не удало�ь во��тановить fd %d: ошибка dup2"
@@ -339,11 +339,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "По команде «%s --help» можно получить дополнительную информацию.\n"
@@ -363,7 +363,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -378,21 +378,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  показать �ту �правку и выйти\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  показать �ту �правку и выйти\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               показать информацию о вер�ии и выйти\n"
@@ -402,20 +402,20 @@ msgstr "  -V, --version               показать информацию о Ð
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Об ошибках �ообщайте по адре�у <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -429,10 +429,10 @@ msgstr ""
 "�ет �ИК�КИХ Г�Р��ТИЙ до �тепени, разрешённой законом.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�втор программы — %s.\n"
@@ -463,37 +463,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "ошибка открыти� файла «%s» дл� чтени�"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "�пецификаци� формата аргумента %u в «%s» не �уще�твует в «%s»"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "�пецификаци� формата аргумента %u не �уще�твует в «%s»"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -534,8 +534,7 @@ msgstr ""
 "Строка ��ылает�� на аргумент номер %u, но игнорирует аргумент номер %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "не �овпадает количе�тво �пецификаций формата в «%s» и «%s»"
@@ -857,8 +856,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "�пецификации формата в «%s» не �вл�ют�� подмноже�твом �пецификаций из «%s»"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "дл� аргумента «%s» нет �пецификации формата в «%s»"
@@ -877,17 +876,17 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "В директиве номер %u � «%c» не может начинать�� им� пол�."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "В директиве номер %u � «%c» не может начинать�� аргумент getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "В директиве номер %u � «%c» не может начинать�� аргумент getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -895,12 +894,12 @@ msgstr ""
 "В директиве номер %u в �пецификаторе формата невозможно указать большую "
 "вложенно�ть."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "В директиве номер %u е�ть незавершённа� директива формата."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -908,30 +907,30 @@ msgstr ""
 "Строка ��ылает�� на аргументы как по именам, так и по безым�нным "
 "�пецификаци�м аргументов."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Строка ��ылает�� на аргумент по имени «%s» не�овме�тимым образом."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "�пецификаци� формата в «%s» ожидает отображение, а в «%s» — кортеж"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "�пецификаци� формата в «%s» ожидает кортеж, а в «%s» — отображение"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "�пецификаци� формата аргумента «%s» в «%s» не �уще�твует в «%s»"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -987,7 +986,7 @@ msgid ""
 msgstr "Символ, завершающий директиву номер %u не �вл�ет�� цифрой между 1 и 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1034,11 +1033,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адре�а дл� заданного имени машины\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Информационный вывод:\n"
@@ -1110,12 +1109,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "принимает�� не более одного входного файла"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s взаимно и�ключают друг друга"
@@ -1134,7 +1133,7 @@ msgstr ""
 "Фильтрует �ообщени� каталога переводов в �оответ�твии � их атрибутами\n"
 "и манипулирует �тими атрибутами.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1144,10 +1143,10 @@ msgid ""
 msgstr ""
 "�ргументы, об�зательные дл� длинных параметров, об�зательны и дл� коротких.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "�ахождение входного файла:\n"
@@ -1157,10 +1156,10 @@ msgstr "�ахождение входного файла:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ВХОД�ОЙ-Ф�ЙЛ                входной PO-файл\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1174,23 +1173,23 @@ msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Е�ли входной файл не задан или задан как -, читает�� �тандартный ввод.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "�ахождение выходного файла:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=Ф�ЙЛ      запи�ать вывод в указанный файл\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1201,7 +1200,7 @@ msgstr ""
 "Результаты вывод�т�� на �тандартный вывод, е�ли выходной файл не задан\n"
 "или задан как -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Выбор �ообщений:\n"
@@ -1324,9 +1323,9 @@ msgid ""
 msgstr ""
 "      --obsolete              �иноним дл� --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1350,17 +1349,17 @@ msgstr ""
 "      --stringtable-input     входной файл имеет �интак�и� NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробно�ти выходного формата:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1375,17 +1374,17 @@ msgstr ""
 "                              КОГД� может быть: «always» (в�егда),\n"
 "                              «never» (никогда), «auto» или «html»\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=Ф�ЙЛ_СТИЛЯ      указать файл правил �тилей CSS дл� --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1393,9 +1392,9 @@ msgstr ""
 "  -e, --no-escape             не и�пользовать при выводе �кранирующие\n"
 "                              по�ледовательно�ти �зыка C (по умолчанию)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1403,28 +1402,28 @@ msgstr ""
 "  -E, --escape                и�пользовать �кранирующие по�ледовательно�ти,\n"
 "                              а не ра�ширенные �имволы\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              запи�ать PO-файл, даже е�ли он пу�т\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                форматировать PO-файл, и�пользу� от�тупы\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           не пи�ать �троки «#: файл:�трока»\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1432,8 +1431,8 @@ msgstr ""
 "  -n, --add-location          генерировать �троки «#: файл:�трока»\n"
 "                              (по умолчанию)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1442,32 +1441,32 @@ msgstr ""
 "�тандарту\n"
 "                                Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     запи�ать .properties-файл Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    запи�ать .strings-файл NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ЧИСЛО           задает ширину выходной �траницы\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1476,31 +1475,31 @@ msgstr ""
 "      --no-wrap               не разбивать длинные �троки, которые длиннее\n"
 "                              ширины выходной �траницы\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           �ортировать вывод\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          �ортировать вывод по именам файлов\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "задан недопу�тимый критерий выбора (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "И�пользование: %s [П�Р�МЕТР] [ВХОД�ОЙ-Ф�ЙЛ]…\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1523,24 +1522,24 @@ msgstr ""
 "но е�ли задан параметр --use-first, то они берут�� из первого PO-файла,\n"
 "в котором были определены.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХОД�ОЙ-Ф�ЙЛ...             входные файлы\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=Ф�ЙЛ       получить �пи�ок входных файлов из Ф�ЙЛ�\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Е�ли входной файл задан как -, читает�� �тандартный ввод.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1550,7 +1549,7 @@ msgstr ""
 "                              определений меньше заданного ЧИСЛ�\n"
 "                              (по умолчанию не ограничено)\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1560,7 +1559,7 @@ msgstr ""
 "                              определений больше заданного ЧИСЛ�\n"
 "                              (по умолчанию больше нул�)\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1569,7 +1568,7 @@ msgstr ""
 "  -u, --unique                �окращение дл� --less-than=2, запрашивает\n"
 "                              печать только уникальных �ообщений\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1578,7 +1577,7 @@ msgstr ""
 "  -P, --properties-input      входные файлы имеют �интак�и� Java ."
 "properties\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1589,12 +1588,12 @@ msgstr ""
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ИМЯ           выходна� кодировка\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1603,14 +1602,14 @@ msgstr ""
 "      --use-first             и�пользовать первый до�тупный перевод дл�\n"
 "                              каждого �ообщени�, не объедин�ть переводы\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=ИМЯ_К�Т�ЛОГ�     задать поле «Language» в заголовке\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Питер Миллер"
 
@@ -1715,7 +1714,7 @@ msgstr "�то �ообщение не было определено в %s"
 msgid "warning: this message is not used"
 msgstr "предупреждение: �то �ообщение не и�пользует��"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1723,12 +1722,12 @@ msgstr[0] "найдена %d критиче�ка� ошибка"
 msgstr[1] "найдено %d критиче�кие ошибки"
 msgstr[2] "найдено %d критиче�ких ошибок"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "необходимо задать не менее двух файлов"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1748,7 +1747,7 @@ msgstr ""
 "комментарии �охран�ют��, но только из первого PO-файла, в котором они\n"
 "были определены. Положени� в файлах �охран�ют�� из в�ех PO-файлов.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1758,7 +1757,7 @@ msgstr ""
 "                              определений больше заданного ЧИСЛ�\n"
 "                              (по умолчанию больше одного)\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1808,7 +1807,7 @@ msgstr ""
 "      --strict                выводить в �трогом �оответ�твии\n"
 "                              �тандарту Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "не задан входной файл"
@@ -1992,76 +1991,76 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "файл «%s» �одержит �троку, не завершённую нулем"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент %s должен быть одиночным знаком пунктуации"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неверный пор�док байт: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ульрих Дреппер"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "нельз� указывать входной файл, е�ли задан %s или %s"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "дл� %s требует�� указать «-d каталог»"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "дл� %s требует�� указать «-l локаль»"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "дл� %s требует�� указать «--template шаблон»"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "дл� %s требует�� указать «-o файл»"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s и %s взаимно и�ключают друг друга в %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s допу�тимо только � %s или %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s допу�тимо только � %s, %s или %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "невозможно �оздать файл вывода «%s»"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -2069,7 +2068,7 @@ msgstr[0] "%d переведённое �ообщение"
 msgstr[1] "%d переведённых �ообщени�"
 msgstr[2] "%d переведённых �ообщений"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -2077,7 +2076,7 @@ msgstr[0] ", %d неточный перевод"
 msgstr[1] ", %d неточных перевода"
 msgstr[2] ", %d неточных переводов"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -2085,27 +2084,27 @@ msgstr[0] ", %d непереведённое �ообщение"
 msgstr[1] ", %d непереведённых �ообщени�"
 msgstr[2] ", %d непереведённых �ообщений"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "И�пользование: %s [П�Р�МЕТР] им�-файла.po …\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Создаёт двоичный каталог �ообщений из тек�тового опи�ани� переводов.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  им�-файл.po ...             входные файлы\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режим работы:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2113,7 +2112,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  режим Java: �оздает Java-кла�� ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2122,12 +2121,12 @@ msgstr ""
 "      --java2                 как --java, но предполагает Java2 (JDK 1.2 или "
 "выше)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                режим C#: генерировать .dll-файл .NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2136,19 +2135,19 @@ msgstr ""
 "      --csharp-resources    режим ре�ур�ов C#: генерировать .resources-файл ."
 "NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   режим Tcl: �оздает .msg-файл дл� tcl/msgcat\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    режим Qt: генерировать .qm-файл Qt\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2156,35 +2155,35 @@ msgstr ""
 "      --desktop               режим Desktop Entry: генерировать файл ."
 "desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    режим Qt: генерировать .qm-файл Qt\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                �трого �оответ�твовать �тандарту Uniforum\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Е�ли выходной файл задан как -, результаты вывод�т�� на �тандартный вывод.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "�ахождение выходного файла в режиме Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       им� ре�ур�а\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2192,7 +2191,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=ЛОК�ЛЬ         им� локали, �то либо �зык, либо �зык_СТР���\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2200,14 +2199,14 @@ msgid ""
 msgstr ""
 "      --source                �оздавать файл .java, вме�то файла .class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d К�Т�ЛОГ                  корневой каталог иерархии каталогов кла��ов\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2220,12 +2219,12 @@ msgstr ""
 "указанный\n"
 "каталог.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "�ахождение выходного файла в режиме C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2234,7 +2233,7 @@ msgstr ""
 "  -d К�Т�ТОГ                 базовый каталог дл� зави��щих от локали .dll-"
 "файлов\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2244,17 +2243,17 @@ msgstr ""
 "подкаталог указанного каталога, им� �того подкаталога зави�ит от\n"
 "локали.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "�ахождение входного файла в режиме Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d К�Т�ЛОГ                  корневой каталог иерархии .msg-файлов\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2263,23 +2262,23 @@ msgstr ""
 "Параметры -l и -d об�зательны. Выходной .msg-файл запи�ывает�� в указанный "
 "каталог.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Параметры режима Desktop Entry:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "  --template=Ш�БЛО�           в каче�тве шаблона и�пользовать файл .desktop\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d К�Т�ЛОГ                  корневой каталог файлов .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2288,7 +2287,7 @@ msgstr ""
 "  -k, --keyword[=СЛОВО]       дополнительное ключевое �лово дл� пои�ка\n"
 "  -k, --keyword               не и�пользовать ключевые �лова по умолчанию\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2298,28 +2297,28 @@ msgstr ""
 "Параметры -l, -o и --template об�зательны. Е�ли указан -D, то входные\n"
 "файлы читают�� из каталога, а не берут�� из аргументов командной �троки.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, fuzzy, c-format
 msgid "XML mode options:\n"
 msgstr "Параметры режима Desktop Entry:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, fuzzy, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 "  --template=Ш�БЛО�           в каче�тве шаблона и�пользовать файл .desktop\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Интерпретаци� входного файла:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2330,13 +2329,13 @@ msgstr ""
 "                              параметрами --check-format, --check-header,\n"
 "                              --check-domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          проверить зави��щие от �зыка форматные �троки\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2344,7 +2343,7 @@ msgid ""
 msgstr ""
 "      --check-header          проверить наличие и �одержимое заголовка\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2354,7 +2353,7 @@ msgstr ""
 "домена\n"
 "                                и параметром --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2363,7 +2362,7 @@ msgstr ""
 "  -C, --check-compatibility   проверить, что GNU msgfmt ведет �еб� так же, \n"
 "                                как X/Open msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2374,13 +2373,13 @@ msgstr ""
 "                              проверить наличие клавиатурных\n"
 "                              �квивалентов дл� пунктов меню\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             и�пользовать при выводе неточные переводы\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2388,7 +2387,7 @@ msgstr ""
 "  -a, --alignment=ЧИСЛО       выравнивать �троки по ЧИСЛУ байт (по "
 "умолчанию: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2400,94 +2399,94 @@ msgstr ""
 "                              пор�дке байт (big или little, значение по\n"
 "                              умолчанию зави�ит от платформы)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               двоичный файл не будет включать х�ш-таблицу\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            напечатать �тати�тику о переводах\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 "  -v, --verbose               увеличить подробно�ть диагно�тиче�ких "
 "�ообщений\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "предупреждение: заголовок PO-файла от�ут�твует или неправилен\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "предупреждение: преобразование кодировок не будет работать\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "предупреждение: заголовок PO-файла помечен как неточный\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "предупреждение: более �тарые вер�ии msgfmt выдадут зде�ь ошибку\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "им� домена «%s» не может быть и�пользовано в каче�тве имени файла"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "им� домена «%s» недопу�тимо в каче�тве имени файла, будет и�пользовано\n"
 "ча�тично у�еченное им� домена"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "директива «domain %s» игнорирует��"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "пу�та� запи�ь «msgstr» игнорирует��"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "неточна� запи�ь «msgstr» игнорирует��"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: предупреждение: и�ходный файл �одержит неточные переводы"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s не �уще�твует"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s �уще�твует, но недо�тупен дл� чтени�"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "ошибка чтени� «%s»"
@@ -2742,12 +2741,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "�нглий�кие переводы дл� пакета %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "текуща� кодировка «%s» не �вл�ет�� перено�имым именем кодировки"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "во входном файле две разные кодировки «%s» и «%s»"
@@ -2767,14 +2766,14 @@ msgstr ""
 "домен «%s» во входном файле «%s» не �одержит запи�ь заголовка � опи�анием "
 "кодировки"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "целева� кодировка «%s» не �вл�ет�� перено�имым именем кодировки."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "предупреждение: "
@@ -2867,26 +2866,26 @@ msgstr ""
 "Вывод «%s» может быть неправильным.\n"
 "Возможный метод обойти �ту �итуацию — у�тановить LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "выражение во множе�твенном чи�ле может давать отрицательные значени�"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, но выражение во множе�твенном чи�ле может давать значени� до "
 "%lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "выражение во множе�твенном чи�ле может давать деление на ноль"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "выражение во множе�твенном чи�ле может дать переполнение целого"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2894,37 +2893,37 @@ msgstr ""
 "выражение во множе�твенном чи�ле может давать и�ключительные �итуации в "
 "арифметике, возможно, деление на ноль"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Попробуйте �ледующее, подходит дл� %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "каталог �ообщений �одержит переводы во множе�твенном чи�ле"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "но в заголовке нет атрибута «plural=ВЫР�ЖЕ�ИЕ»"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "но в заголовке нет атрибута «nplurals=ЦЕЛОЕ»"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "неверна� значение nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "неверное выражение во множе�твенном чи�ле"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2932,7 +2931,7 @@ msgstr[0] "но в некоторых �ообщени�х только %lu фо
 msgstr[1] "но в некоторых �ообщени�х только %lu формы во множе�твенном чи�ле"
 msgstr[2] "но в некоторых �ообщени�х только %lu форм во множе�твенном чи�ле"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2940,7 +2939,7 @@ msgstr[0] "но в некоторых �ообщени�х е�ть %lu форм
 msgstr[1] "но в некоторых �ообщени�х е�ть %lu формы во множе�твенном чи�ле"
 msgstr[2] "но в некоторых �ообщени�х е�ть %lu форм во множе�твенном чи�ле"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2948,89 +2947,94 @@ msgstr ""
 "каталог �ообщений �одержит переводы во множе�твенном чи�ле, но в нем "
 "заголовка � «Plural-Forms: nplurals=ЦЕЛОЕ; plural=ВЫР�ЖЕ�ИЕ;»"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "пол� «msgid» и «msgid_plural» не начинают�� � «\\n»"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "пол� «msgid» и «msgstr[%u]» не начинают�� � «\\n»"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "пол� «msgid» и «msgstr» не начинают�� � «\\n»"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "пол� «msgid» и «msgid_plural» не заканчивают�� «\\n»"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "пол� «msgid» и «msgstr[%u]» не заканчивают�� «\\n»"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "пол� «msgid» и «msgstr» не заканчивают�� «\\n»"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "обработка форм во множе�твенном чи�ле �вл�ет�� ра�ширением GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "в msgstr недо�тает отметки клавиатурного �квивалента «%c»"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "в msgstr �лишком много отметок клавиатурных �квивалентов «%c»"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr ""
 "поле заголовка «%s» в�ё ещё �одержит первоначальное значение по умолчанию\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "в заголовке от�ут�твует поле «%s»\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: неверные данные дл� кодировки «%s»"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: ошибка при преобразовании из кодировки «%s» в кодировку «%s»"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "входной файл не �одержит поле заголовка � опи�анием кодировки"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3039,7 +3043,7 @@ msgstr ""
 "�евозможно преобразовать из «%s» в «%s». %s полагает�� на iconv(), но "
 "iconv() не поддерживает �то преобразование."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3048,8 +3052,8 @@ msgstr ""
 "Преобразование из «%s» в «%s» порождает дубликаты: некоторые различающие�� "
 "оригиналы �ообщений �танов�т�� одинаковыми."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3490,7 +3494,7 @@ msgid "context separator <EOT> within string"
 msgstr "разделитель контек�та <EOT> внутри �троки"
 
 # �то �ообщение пока не и�пользует��
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "�тот файл не может �одержать директивы домена"
@@ -3512,32 +3516,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr "предупреждение: неверный �имвол Unicode"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "не задано им� фильтра"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "неверна� значение nplurals"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файл «%s» у�ечён"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файл «%s» �одержит �троку, не завершённую нулем"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "файл «%s» не в �оответ�твует формату GNU .mo"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файл «%s» �одержит �троку, не завершённую нулем, в позиции %s"
@@ -3719,25 +3723,25 @@ msgstr "компил�ци� C#-кла��а завершила�ь неу�пе
 msgid "compilation of C# class failed"
 msgstr "компил�ци� кла��а C# завершила�ь � ошибкой"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "ошибка открыти� «%s» дл� запи�и"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "%s не �вл�ет�� верным именем кла��а Java"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "компил�ци� кла��а Java завершила�ь � ошибкой, попробуйте --verbose или "
 "у�тановите $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3849,12 +3853,12 @@ msgstr ""
 "каталогов �ообщений дл� Tcl не поддерживает обработку множе�твенного\n"
 "чи�ла\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: предупреждение: незавершенна� �трока"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: предупреждение: незавершенное регул�рное выражение"
@@ -3874,7 +3878,7 @@ msgstr "%s:%d: предупреждение: незавершенна� �имв
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: предупреждение: незавершенна� �трока"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Укажите входную кодировку � помощью параметра --from-code."
 
@@ -3914,7 +3918,7 @@ msgstr ""
 "%s:%d: �еполна� многобайтова� по�ледовательно�ть в конце �троки.\n"
 "Укажите входную кодировку � помощью параметра --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: вызов iconv завершил�� � ошибкой"
@@ -3928,7 +3932,7 @@ msgstr ""
 "%s:%d: �еверна� многобайтова� по�ледовательно�ть.\n"
 "Укажите входную кодировку � помощью параметра --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: предупреждение: неверный �имвол Unicode"
@@ -3948,56 +3952,56 @@ msgstr "%s:%d: предупреждение: в�тречена «)», где о
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: предупреждение: в�тречена «}», где ожидает�� «)»"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "«%s» не �вл�ет�� корректным именем кодировки. И�пользует�� ASCII.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "�зык «%s» неизве�тен"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "параметр --join-existing не может быть и�пользован при запи�и в �тандартный "
 "вывод"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не может работать, не зна� и�комых ключевых �лов"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "предупреждение: файл «%s» имеет неизве�тное ра�ширение «%s»; трактует�� как C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извлекает переводимые �троки из указанных входных файлов.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4005,23 +4009,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=ИМЯ    выводить в файл ИМЯ.po (вме�то messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=Ф�ЙЛ           запи�ать вывод в указанный файл\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=К�Т        поме�тить выходные файлы в каталог К�Т\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Выбор �зыка входного файла:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4040,19 +4044,19 @@ msgstr ""
 "                              GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                              JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   �иноним --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "По умолчанию �зык определ�ет�� по ра�ширению входного файла.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4061,22 +4065,22 @@ msgstr ""
 "      --from-code=ИМЯ            кодировка входных файлов\n"
 "                                   (кроме Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "По умолчанию �читает��, что входные файлы �одержат только ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         �лить �ообщени� � �уще�твующим файлом\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=Ф�ЙЛ.po  не извлекать вхождени� из Ф�ЙЛ�.po\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4090,15 +4094,15 @@ msgstr ""
 "  -c, --add-comments          запи�ать в�е блоки комментариев, начина� �\n"
 "                              предше�твующих ключевых �трок в выходной файл\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4106,17 +4110,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Параметры дл� конкретных �зыков:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           извлечь в�е �троки\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4131,7 +4135,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4146,7 +4150,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4157,7 +4161,7 @@ msgstr ""
 "аргумента\n"
 "                              номер �РГ ключевого �лова СЛОВО\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4172,37 +4176,48 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             понимать на входе триграфы ANSI C\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (только �зыки C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=Ф�ЙЛ       получить �пи�ок входных файлов из Ф�ЙЛ�\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (только �зык C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    ра�познавать форматные �троки Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (только �зык C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   ра�познавать форматные �троки KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 ра�познавать форматные �троки Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4210,30 +4225,24 @@ msgstr ""
 "      --debug                 более подробный результат разбора форматной "
 "�троки\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     запи�ать .properties-файл Java\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=Ф�ЙЛ       получить �пи�ок входных файлов из Ф�ЙЛ�\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --indent                и�пользовать на выводе от�тупы\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=СТРОК�\n"
 "                      задает наименование обладател� автор�ких прав\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4241,19 +4250,19 @@ msgstr ""
 "      --foreign-user          не выводить уведомление об автор�ких правах "
 "FSF\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=П�КЕТ    задать им� пакета дл� вывода\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=ВЕРСИЯ\n"
 "                              задать вер�ию пакета дл� вывода\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4262,7 +4271,7 @@ msgstr ""
 "                      задает адре�, куда �ледует отправл�ть отчет об "
 "ошибках\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4273,7 +4282,7 @@ msgstr ""
 "                              и�пользовать СТРОКУ или «» как префик�\n"
 "                              к значени�м msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4284,7 +4293,7 @@ msgstr ""
 "                              и�пользовать СТРОКУ или «» как �уффик�\n"
 "                              к значени�м msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4293,31 +4302,31 @@ msgstr ""
 "�ргумент --flag не �оответ�твует �интак�и�у <ключевое-�лово>:<номер-арг>:"
 "[pass-]<флаг>: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "�тандартный ввод"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "�е ASCII-�имвол у %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "�е ASCII-комментарий у или перед %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "�е ASCII-�трока у %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: предупреждение: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4326,7 +4335,7 @@ msgstr ""
 "�е�мотр� на и�пользование в ме�те, где предполагает�� форматна� �трока, %s "
 "не �вл�ет�� верной форматной �трокой %s. Причина: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4335,7 +4344,7 @@ msgstr ""
 "Строка %s не �вл�ет�� верной форматной �трокой %s, хот� и объ�влена как "
 "такова�. Причина: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4349,7 +4358,7 @@ msgstr ""
 "И�пользуйте форматную �троку � именованными аргументами и\n"
 "отображение вме�то кортежа дл� аргументов.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4359,29 +4368,29 @@ msgstr ""
 "gettext(\"\") возвращает тек�т заголовка � метаинформацией,\n"
 "а не пу�тую �троку.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неоднозначна� �пецификаци� аргумента дл� ключевого �лова «%.*s»"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "предупреждение: не указан контек�т дл� ключевого �лова «%.*s»"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "предупреждение: не указан контек�т дл� аргумента во множе�твенном чи�ле у "
 "ключевого �лова «%.*s»"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "не �овпадают контек�ты у форм в един�твенном и множе�твенном чи�ле"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4392,7 +4401,7 @@ msgstr ""
 "«Makevars», у�тановите в нём переменную MSGID_BUGS_ADDRESS, в\n"
 "противном �лучае задайте в командной �троке параметр --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "�зык «%s» неизве�тен"
@@ -4501,7 +4510,7 @@ msgstr "%s:%d: невернаÑ� интерполÑ�циÑ� («\\L») воÑ�ьмиÐ
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неверна� интерпол�ци� («\\U») во�ьмибитного �имвола «%c»"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4509,7 +4518,7 @@ msgstr ""
 "Укажите входную кодировку � помощью параметра --from-code или � помощью\n"
 "комментари�, как опи�ано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4520,7 +4529,7 @@ msgstr ""
 "Укажите входную кодировку � помощью параметра --from-code или � помощью\n"
 "комментари�, как опи�ано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4531,7 +4540,7 @@ msgstr ""
 "Укажите входную кодировку � помощью параметра --from-code или � помощью\n"
 "комментари�, как опи�ано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4542,7 +4551,7 @@ msgstr ""
 "Укажите входную кодировку � помощью параметра --from-code или � помощью\n"
 "комментари�, как опи�ано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4553,7 +4562,7 @@ msgstr ""
 "Укажите входную кодировку � помощью параметра --from-code или � помощью\n"
 "комментари�, как опи�ано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4564,22 +4573,22 @@ msgstr ""
 "Укажите входную кодировку � помощью параметра --from-code или � помощью\n"
 "комментари�, как опи�ано на http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Кодировка «%s» неизве�тна. Вме�то неё и�пользуем ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неверное определение �троки"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: пропущено чи�ло по�ле #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неверное �троковое выражение"
diff --git a/gettext-tools/po/sk.gmo b/gettext-tools/po/sk.gmo
index f5c2df4..4041a85 100644
--- a/gettext-tools/po/sk.gmo
+++ b/gettext-tools/po/sk.gmo
diff --git a/gettext-tools/po/sk.po b/gettext-tools/po/sk.po
index 39714c8..6b74f89 100644
--- a/gettext-tools/po/sk.po
+++ b/gettext-tools/po/sk.po
@@ -1,15 +1,15 @@
 # Slovak translations for GNU gettext-tools package.
-# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Štefan Ondreji�ka <ondrej@idata.sk>, 1999.
-# Marcel Telka <marcel@telka.sk>, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010, 2012, 2013, 2014, 2015.
+# Marcel Telka <marcel@telka.sk>, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19.7-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-23 14:24+0100\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-02 06:44+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
@@ -109,7 +109,7 @@ msgid "Unknown system error"
 msgstr "Neznáma systémová chyba"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -187,15 +187,15 @@ msgstr "neplatný parameter source_version pre compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "neplatný parameter target_version pre compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "zlyhalo vytvorenie \"%s\""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -221,39 +221,39 @@ msgid "%s subprocess I/O error"
 msgstr "V/V chyba podprocesu %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "pamäť je vy�erpaná"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "vytváranie vláken zlyhalo"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "zápis do podprocesu %s zlyhal"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "�ítanie z podprocesu %s zlyhalo"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "nemožno nastaviž neblokujúce V/V do podprocesu %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "komunikácia s podprocesom %s zlyhala"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "podproces %s skon�il s ukon�ovacím kódom %d"
@@ -292,18 +292,18 @@ msgstr "“"
 msgid "setting permissions for %s"
 msgstr "nastavovanie oprávnení pre %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "nemožno vytvoriť rúru"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "zlyhalo _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "nemožno obnoviť fd %d: zlyhalo dup2"
@@ -335,11 +335,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "Element <%s> nemá vlastnosť <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Skúste '%s --help' a dozviete sa viac informácií.\n"
@@ -365,7 +365,7 @@ msgstr ""
 "pre gettext. Ak nie sú zadané žiadne parametre, na�íta CLDR pravidlá\n"
 "množného �ísla zo štandardného vstupu.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -382,21 +382,21 @@ msgstr ""
 "CLDR\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  zobraziť túto nápovedu a skon�iť\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               zobraziť informáciu o verzii a skon�iť\n"
@@ -406,11 +406,11 @@ msgstr "  -V, --version               zobraziť informáciu o verzii a skon�iť
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Správy o chybách zasielajte na adresu <bug-gnu-gettext@gnu.org> (iba "
@@ -419,11 +419,11 @@ msgstr ""
 "sk>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -437,10 +437,10 @@ msgstr ""
 "Neposkytuje sa ŽIADNA Z�RUKA, v rozsahu povolenom zákonmi.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Napísal %s.\n"
@@ -471,37 +471,37 @@ msgid "extra operand %s"
 msgstr "operand %s navyše"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "chyba pri otváraní súboru \"%s\" na �ítanie"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "formátovacia zna�ka pre parameter %u v '%s' nie je v '%s'"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formátovacia zna�ka pre parameter %u nie je v '%s'"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -539,8 +539,7 @@ msgstr ""
 "Reťazec sa odkazuje na parameter �íslo %u, ale ignoruje parameter �íslo %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "po�et formátovacích zna�iek v '%s' a '%s' sa nezhoduje"
@@ -853,8 +852,8 @@ msgstr "formátovacie zna�ky v '%s' a '%s' nie sú ekvivalentné"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formátovacie zna�ky v '%s' nie sú podmnožinou zna�iek z '%s'"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formátovacia zna�ka pre parameter '%s' nie je v '%s'"
@@ -873,29 +872,29 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "V direktíve �íslo %u, '%c' nemôže byť na za�iatku názvu poľa."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "V direktíve �íslo %u, '%c' nemôže byť na za�iatku parametra getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "V direktíve �íslo %u, '%c' nemôže byť na za�iatku parametra getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 "V direktíve �íslo %u nie je povolené �alšie vnorenie v špecifikácii formátu."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "V direktíve �íslo %u je neukon�ená formátovacia direktíva."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -903,13 +902,13 @@ msgstr ""
 "Reťazec sa odkazuje na parameter cez meno parametra aj cez nepomenované "
 "špecifikácie parametra."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "Reťazec sa odkazuje na argument pomenovaný '%s' nekompatibilnými spôsobmi."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -917,7 +916,7 @@ msgstr ""
 "formátovacie zna�ky v '%s' predpokladajú mapovanie, ale zna�ky v '%s' "
 "predpokladajú tuple"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -925,13 +924,13 @@ msgstr ""
 "formátovacie zna�ky v '%s' predpokladajú tuple, ale zna�ky v '%s' "
 "predpokladajú mapovanie"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "formátovacia zna�ka pre parameter '%s' v '%s' nie je v '%s'"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -987,7 +986,7 @@ msgid ""
 msgstr "Znak, ktorý ukon�uje direktívu �íslo %u nie je �íslica medzi 1 a 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1035,11 +1034,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresy pre meno hostiteľa\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatívny výstup:\n"
@@ -1111,12 +1110,12 @@ msgstr "koreňový element nie je \"locatingRules\""
 msgid "at most one input file allowed"
 msgstr "povolený najviac jeden vstupný súbor"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s a %s sa navzájom vylu�ujú"
@@ -1135,7 +1134,7 @@ msgstr ""
 "Filtruje správy z prekladového katalógu podľa ich vlastností a mení tieto\n"
 "vlastnosti.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1144,10 +1143,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Povinné parametre pre dlhé voľby sú povinnými aj pre skrátené voľby.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Umiestnenie vstupného súboru:\n"
@@ -1157,10 +1156,10 @@ msgstr "Umiestnenie vstupného súboru:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VSTUPN�SÚBOR                vstupný PO súbor\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1175,23 +1174,23 @@ msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Ak nie je zadaný vstupný súbor alebo je -, je na�ítaný štandardný vstup.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Umiestnenie výstupného súboru:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=SÚBOR     zapísať výstup do zadaného súboru\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1202,7 +1201,7 @@ msgstr ""
 "Výsledky sú zapísané na štandardný výstup ak nie je zadaný výstupný súbor\n"
 "alebo ak je -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Výber správy:\n"
@@ -1327,9 +1326,9 @@ msgstr ""
 "      --obsolete              synonymum pre --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1353,17 +1352,17 @@ msgstr ""
 "      --stringtable-input     vstupný súbor má syntax NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti výstupu:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1377,16 +1376,16 @@ msgstr ""
 "'never' (nikdy),\n"
 "                              'auto' (automaticky) alebo 'html'.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=SÚBORŠT�LU      zadať pravidlo štýlu CSS pre --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1394,9 +1393,9 @@ msgstr ""
 "  -e, --no-escape             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1405,29 +1404,29 @@ msgstr ""
 "C,\n"
 "                              bez rozšírených znakov\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              zapísať súbor PO, aj ke� bude prázdny\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                zapísať .po súbor s použitím odsadzovania\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1435,8 +1434,8 @@ msgstr ""
 "  -n, --add-location          generovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1444,32 +1443,32 @@ msgstr ""
 "      --strict                zapísať .po súbor presne dodržiavajúci štýl\n"
 "                              Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     zapísať Java súbor .properties\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    zapísať súbor NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=Č�SLO           nastaviť šírku výstupnej strany\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1478,32 +1477,32 @@ msgstr ""
 "      --no-wrap               nezalamovať riadky správ dlhšie ako šírka\n"
 "                              výstupnej strany do viacerých riadkov\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generovať utriedený výstup\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "je uvedené nepovolené kritérium výberu (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Použitie: %s [VOĽBA] [VSTUPN�SÚBOR]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1526,24 +1525,24 @@ msgstr ""
 "--use-first, ktorá zabezpe�í ich zachovanie iba z prvého PO súboru, ktorý\n"
 "ich definuje.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  VSTUPN�SÚBOR ...            vstupné súbory\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=SÚBOR      získať zoznam vstupných súborov zo SÚBORu\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Ak je vstupný súbor -, na�ítaný je štandardný vstup.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1552,7 +1551,7 @@ msgstr ""
 "  -<, --less-than=POČET       vypísať správy, ktoré sú definované menej ako\n"
 "                              POČET-krát, štandardne nastavené na nekone�no\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1561,7 +1560,7 @@ msgstr ""
 "  ->, --more-than=POČET       vypísať správy, ktoré sú defineované viac\n"
 "                              ako POČET-krát, štandardne nastavené na 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1570,7 +1569,7 @@ msgstr ""
 "  -u, --unique                skratka pre --less-than=2, nastavuje výpis\n"
 "                              len unikátnych správ\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1578,7 +1577,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      vstupné súbory májú syntax Java .properties\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1588,12 +1587,12 @@ msgstr ""
 "      --stringtable-input     vstupné súbory majú syntax NeXTstep-GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=N�ZOV         kódovanie pre výstup\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1603,7 +1602,7 @@ msgstr ""
 "správu,\n"
 "                              nezlu�ovať viacero prekladov\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1611,7 +1610,7 @@ msgstr ""
 "      --lang=N�ZOVKATALÓGU    nastaviť pole 'Language' v položke hlavi�ka\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1717,7 +1716,7 @@ msgstr "táto správa je použitá, ale nie je definovaná v %s"
 msgid "warning: this message is not used"
 msgstr "upozornenie: táto správa nie je použitá"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1725,12 +1724,12 @@ msgstr[0] "nájdených %d závažných chýb"
 msgstr[1] "nájdená %d závažná chyba"
 msgstr[2] "nájdené %d závažné chyby"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "musia byť uvedené minimálne dva súbory"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1750,7 +1749,7 @@ msgstr ""
 "komentáre budú zachované iba z prvého PO súboru, v ktorom sú definované.\n"
 "Pozície v zdrojových súboroch budú zlú�ené zo všetkých PO súborov.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1759,7 +1758,7 @@ msgstr ""
 "  ->, --more-than=POČET       vypísať správy, ktoré sú defineované viac\n"
 "                              ako POČET-krát, štandardne nastavené na 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1808,7 +1807,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                presné dodržiavanie štýlu Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "nie sú zadané vstupné súbory"
@@ -1996,76 +1995,76 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "výstup filtra nie je ukon�ený znakom nový riadok"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "parameter pre %s by malo byť len jedno interpunk�né znamienko"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "neplatné poradie bajtov: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "ak sú uvedené %s a %s, vstupný súbor nemá byť zadaný"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-d adresár\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-l národné prostredie\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s vyžaduje špecifikáciu \"--template šablóna\""
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s vyžaduje špecifikáciu \"-o súbor\""
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s a %s sa navzájom vylu�ujú v %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s je platné len s %s alebo %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s je platné len s %s, %s alebo %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "nemožno nájsť pravidlá ITS pre %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -2073,7 +2072,7 @@ msgstr[0] "%d preložených správ"
 msgstr[1] "%d preložená správa"
 msgstr[2] "%d preložené správy"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -2081,7 +2080,7 @@ msgstr[0] ", %d nepresných prekladov"
 msgstr[1] ", %d nepresný preklad"
 msgstr[2] ", %d nepresné preklady"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -2089,27 +2088,27 @@ msgstr[0] ", %d nepreložených správ"
 msgstr[1] ", %d nepreložená správa"
 msgstr[2] ", %d nepreložené správy"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Použitie: %s [VOĽBA] menosúboru.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Generovať binárny katalóg správ z textového popisu prekladu.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  menosúboru.po ...           vstupné súbory\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mód �innosti:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2118,7 +2117,7 @@ msgstr ""
 "  -j, --java                  režim Java: generovať triedu Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2128,13 +2127,13 @@ msgstr ""
 "alebo\n"
 "                              vyššie)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                režim C#: generovať .dll súbor pre .NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2143,19 +2142,19 @@ msgstr ""
 "      --csharp-resources      režim zdrojov C#: generovať .resources súbor "
 "pre .NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   režim Tcl: generovať súbor .msg tcl/msgcat\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    režim Qt: generovať Qt súbor .qm\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2163,33 +2162,33 @@ msgstr ""
 "      --desktop               režim položiek pracovnej plochy: generovať "
 "súbor .desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   režim XML: generovať súbor XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                povoliť presne dodržaný režim Uniforum\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Ak je výstupný súbor -, výstup je zapísaný na štandardný výstup.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Umiestnenie výstupného súboru v režime Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ZDROJ        názov zdroja\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2198,7 +2197,7 @@ msgstr ""
 "  -l, --locale=N_PROSTREDIE   názov národného prostredia, bu� jazyk alebo\n"
 "                              jazyk_KRAJINA\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2206,14 +2205,14 @@ msgid ""
 msgstr ""
 "      --source                vytvorí súbor .java, namiesto súboru .class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d ADRES�R                  základný adresár adresárov hierarchie tried\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2225,12 +2224,12 @@ msgstr ""
 "oddelené znakom \"_\". Voľba -d je povinná. Trieda je zapísaná do zadaného\n"
 "adresára.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Umiestnenie výstupného súboru v režime C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2239,7 +2238,7 @@ msgstr ""
 "  -d ADRES�R                  základný adresár pre lokálne závislé .dll "
 "súbory\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2249,17 +2248,17 @@ msgstr ""
 "adresára,\n"
 "ktorého názov závisí od národného prostredia.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Umiestnenie výstupného súboru v režime Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d ADRES�R                  základný adresár katalógov správ .msg\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2267,22 +2266,22 @@ msgid ""
 msgstr ""
 "Voľby -l a -d sú povinné. Súbor .msg je zapísaný do zadaného adresára.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Voľby pre položky pracovnej plochy:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=ŠABLÓNA          súbor .desktop použitý ako šablóna\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d ADRES�R                  základný adresár súborov .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2291,7 +2290,7 @@ msgstr ""
 "  -kSLOVO, --keyword=SLOVO    hľadať SLOVO ako �alšie kľú�ové slovo\n"
 "  -k, --keyword               nepoužiť predvolené kľú�ové slová)\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2301,27 +2300,27 @@ msgstr ""
 "Voľby -l, -o a --template sú povinné.  Ak je zadané -D, vstupné súbory sú\n"
 "na�ítané zo zadaného adresára, namiesto z parametrov príkazového riadka.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Volby režimu XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=N�ZOV        použiť zadaný jazyk XML\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=ŠABLÓNA          súbor XML použitý ako šablóna\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretácia vstupného súboru:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2332,14 +2331,14 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          kontrolovať jazykovo závislé formátované "
 "reťazce\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2347,7 +2346,7 @@ msgid ""
 msgstr ""
 "      --check-header          overiť prítomnosť a obsah položky hlavi�ky\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2357,7 +2356,7 @@ msgstr ""
 "domény\n"
 "                                a voľbou --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2366,7 +2365,7 @@ msgstr ""
 "  -C, --check-compatibility   kontrolovať, �i sa GNU msgfmt správa tak ako\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2377,12 +2376,12 @@ msgstr ""
 "skratiek\n"
 "                                pre položky menu\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             použiť nepresné preklady vo výstupe\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2390,7 +2389,7 @@ msgstr ""
 "  -a, --alignment=POČET       zarovnať reťazce na POČET bajtov (štandardne: "
 "%d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2403,7 +2402,7 @@ msgstr ""
 "                                 (big alebo little, predvolené závisí na "
 "platforme)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2411,84 +2410,84 @@ msgstr ""
 "      --no-hash               binárny súbor nebude obsahovať hašovaciu "
 "tabuľku\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            zobraziť štatistiky prekladov\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               zvýšiť úroveň táravosti\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "upozornenie: hlavi�ka súboru PO chýba alebo je neplatná\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "upozornenie: konverzia znakovej sady nebude fungovať\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "upozornenie: hlavi�ka súboru PO je nepresná\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "upozornenie: staršie verzie msgfmt vrátia pri tomto chybu\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "meno domény \"%s\" nie je použitelné ako meno súboru"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "meno domény \"%s\" nie je použitelné ako meno súboru: použije sa predpona"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direktíva 'domain %s' bola ignorovaná"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "prázdna položka 'msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "nepresná položka 'msgstr' bola ignorovaná"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s neexistuje"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existuje, ale nedá sa �ítať"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba pri �ítaní súboru \"%s\""
@@ -2738,12 +2737,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Slovenské preklady pre balík %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "aktuálna znaková sada \"%s\" nie je prenositeľné meno kódovania"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dve rozdielne znakové sady \"%s\" a \"%s\" vo vstupnom súbore"
@@ -2762,14 +2761,14 @@ msgid ""
 msgstr ""
 "doména \"%s\" vo vstupnom súbore '%s' nemá v hlavi�ke uvedenú znakovú sadu"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "cieľová znaková sada \"%s\" nie je prenositeľné meno kódovania."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "upozornenie: "
@@ -2864,26 +2863,26 @@ msgstr ""
 "Výstup z '%s' môže byť nesprávny.\n"
 "Možnou obchádzkou je nastavenie LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "výraz pre množné �íslo môže nadobúdať záporné hodnoty"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, ale výraz pre množné �íslo môže nadobúdať hodnoty vä�šie ako "
 "%lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "výraz pre množné �íslo môže spôsobiť delenie nulou"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "výraz pre množné �íslo môže spôsobiť celo�íselné prete�enie"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2891,37 +2890,37 @@ msgstr ""
 "výraz pre množné �íslo môže spôsobiť aritmetickú výnimku, pravdepodobne "
 "delenie nulou"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Skúste použiť nasledujúce, platné pre %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "katalóg správ má preklady s množnými �íslami"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ale v hlavi�ke chýba príznak \"plural=V�RAZ\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "ale v hlavi�ke chýba príznak \"nplurals=Č�SLO\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "neplatná hodnota nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "neplatný výraz pre množné �íslo"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2929,7 +2928,7 @@ msgstr[0] "ale niektoré správy majú len %lu tvarov množných �ísel"
 msgstr[1] "ale niektoré správy majú len %lu tvar množného �ísla"
 msgstr[2] "ale niektoré správy majú len %lu tvary množných �ísel"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2937,7 +2936,7 @@ msgstr[0] "ale niektoré správy majú %lu tvarov množných �ísel"
 msgstr[1] "ale niektoré správy majú %lu tvar množného �ísla"
 msgstr[2] "ale niektoré správy majú %lu tvary množných �ísel"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2945,88 +2944,93 @@ msgstr ""
 "katalóg správ má preklady s množnými �íslami, ale v hlavi�ke chýba \"Plural-"
 "Forms: nplurals=�SLO; plural=V�RAZ;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "položky 'msgid' a 'msgid_plural' neza�ínajú obe s '\\n'"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "položky 'msgid' a 'msgstr[%u]' neza�ínajú obe s '\\n'"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "položky 'msgid' a 'msgstr' neza�ínajú obe s '\\n'"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "položky 'msgid' a 'msgid_plural' nie sú obe ukon�ené s '\\n'"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "položky 'msgid' a 'msgstr[%u]' nie sú obe ukon�ené s '\\n'"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "položky 'msgid' a 'msgstr' nie sú obe ukon�ené s '\\n'"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "spracovanie množných �ísel je rozšírením GNU"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr chýba zna�ka klávesovej skratky '%c'"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr obsahuje príliš veľa zna�iek klávesových skratiek '%c'"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "položka hlavi�ky '%s' ešte obsahujú po�iato�nú štandardnú hodnotu\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "položka hlavi�ky '%s' v hlavi�ke chýba\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "ASCII vypustenie ('...') namiesto Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "nájdená medzera pred vypustením v reťazci viditeľnom používateľmi"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "použité ASCII dvojité úvodzovky namiesto Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "použité ASCII jednoduché úvodzovky namiesto Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII guli�ka ('%c') namiesto Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: vstup nie je platný v kódovaní \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: chyba pri konverzii kódovania z \"%s\" na \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "vstupný súbor nemá v hlavi�ke uvedenú znakovú sadu"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3035,7 +3039,7 @@ msgstr ""
 "Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv() a iconv() "
 "nepodporuje takúto konverziu."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3044,8 +3048,8 @@ msgstr ""
 "Konverzia z \"%s\" do \"%s\" zavedie duplicity: niektoré rozdielne msgid sa "
 "stanú rovnakými."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3477,7 +3481,7 @@ msgstr "koniec riadka uprostred reťazca"
 msgid "context separator <EOT> within string"
 msgstr "oddeľova� kontextu <EOT> v reťazci"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento súbor nesmie obsahovať direktívy pre doménu"
@@ -3498,31 +3502,31 @@ msgstr "neukon�ené meno skupiny"
 msgid "invalid non-blank character"
 msgstr "neplatný neprázdny znak"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "chýbajúce '=' za \"%s\""
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "neplatný neprázdny riadok"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "súbor \"%s\" je skrátený"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "súbor \"%s\" obsahuje reťazce, ktoré nie sú ukon�ené nulou"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "súbor \"%s\" nie je vo formáte GNU .mo"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "súbor \"%s\" obsahuje reťazec, ktorý nie je ukon�ený nulou, na %s"
@@ -3703,24 +3707,24 @@ msgstr "kompilácia triedy C# zlyhala, prosím skúste --verbose"
 msgid "compilation of C# class failed"
 msgstr "kompilácia triedy C# zlyhala"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "chyba pri otváraní súboru  \"%s\" na zápis"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nie je platným názvom triedy Java: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompilácia triedy Java zlyhala, prosím skúste --verbose alebo nastavte $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilácia triedy Java zlyhala, prosím skúste nastaviť $JAVAC"
@@ -3827,12 +3831,12 @@ msgstr ""
 "katalóg správ má preklady s množnými �íslami,\n"
 "ale formát katalógu správ Tcl nepodporuje množné �ísla\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozornenie: neukon�ený reťazec"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozornenie: neukon�ený regulárny výraz"
@@ -3852,7 +3856,7 @@ msgstr "%s:%d: upozornenie: neukon�ená znaková konštanta"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozornenie: neukon�ený znakový reťazec"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Prosím, zadajte kódovanie zdroja pomocou --from-code."
 
@@ -3892,7 +3896,7 @@ msgstr ""
 "%s:%d: Nekompletná viacbajtová postupnosť na konci riadka.\n"
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv zlyhal"
@@ -3906,7 +3910,7 @@ msgstr ""
 "%s:%d: Neplatná viacbajtová postupnosť.\n"
 "Prosím, zadajte kódovanie zdroja pomocou --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: upozornenie: neplatný znak Unicode"
@@ -3926,38 +3930,38 @@ msgstr "%s:%d: upozornenie: nájdené ')' tam, kde bolo o�akávané '}'"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: upozornenie: nájdené '}' tam, kde bolo o�akávané ')'"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "'%s' nie je platný názov kódovania.  Použijem ASCII namiesto neho.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "kontrola syntaxe '%s' je neznáma"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "typ ukon�enia vety '%s' je neznámy"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing nemožno použiť ak je výstup posielaný na štandardný výstup"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nemôže pracovať bez kľú�ových slov, ktoré má hľadať"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "upozornenie: súbor pravidiel ITS '%s' neexistuje"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -3965,17 +3969,17 @@ msgstr ""
 "upozornenie: súbor pravidiel ITS '%s' neexistuje; skontrolujte vašu "
 "inštaláciu gettext-u"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "upozornenie: súbor '%s' s príponou '%s' je neznámy; skúsim C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrahovať preložiteľné reťazce zo zadaných vstupných súborov.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3984,12 +3988,12 @@ msgstr ""
 "  -d, --default-domain=N�ZOV  použiť N�ZOV.po pre výstup (namiesto messages."
 "po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=SÚBOR          zapísať výstup do zadaného súboru\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3997,12 +4001,12 @@ msgstr ""
 "  -p, --output-dir=ADRES�R    výstupné súbory budú umiestnené v adresári "
 "ADRES�R\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Voľba jazyka vstupného súboru:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4023,19 +4027,19 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   skratka pre --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Štandardne je jazyk odhadnutý podľa prípony vstupného súboru\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4044,24 +4048,24 @@ msgstr ""
 "      --from-code=N�ZOV       kódovanie vstupných súborov\n"
 "                                (s výnimkou pre Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Štandardne sa predpokladá, že vstupné súbory sú v kódovaní ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         spojiť správy s existujúcim súborom\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=SÚBOR.po  položky zo súboru SÚBOR.po nie sú "
 "extrahované\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4078,18 +4082,18 @@ msgstr ""
 "                                predchádzajú riadky s kľú�ovými slovami,\n"
 "                                do výstupného súboru\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=MENO            vykonať kontrolu syntaxe na správach\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4100,17 +4104,17 @@ msgstr ""
 "                                (single-space, ktoré je predvolené,\n"
 "                                 alebo double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Voľby špecifické pre jednotlivé jazyky:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahovať všetky reťazce\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4125,7 +4129,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4140,7 +4144,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4151,7 +4155,7 @@ msgstr ""
 "�íslo\n"
 "                              ARG kľú�ového slova SLOVO\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4166,37 +4170,47 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             poznať ANSI C trojznaky na vstupe\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (len jazyky C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=SÚBOR             použiť pravidlá ITS zo SÚBORu\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (len jazyky založené na XML)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    rozoznať formát reťazcov Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (len jazyk C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   rozoznať formát reťazcov KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 rozoznať formát reťazcov Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4205,29 +4219,24 @@ msgstr ""
 "formátovacích\n"
 "                              reťazcov\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapísať Java súbor .properties\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=SÚBOR             použiť pravidlá ITS zo SÚBORu\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               zapísať komentáre itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=REŤAZEC nastaviť držiteľa autorských práv vo "
 "výstupe\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4235,17 +4244,17 @@ msgstr ""
 "      --foreign-user          vynechať informáciu o autorských právach FSF\n"
 "                              pre cudzieho používateľa\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=BAL�K    nastaviť názov balíka vo výstupe\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERZIA   nastaviť verziu balíka vo výstupe\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4254,7 +4263,7 @@ msgstr ""
 "chýb\n"
 "                                   v msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4265,7 +4274,7 @@ msgstr ""
 "predponu\n"
 "                                pre hodnoty msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4276,7 +4285,7 @@ msgstr ""
 "príponu pre\n"
 "                                hodnoty msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4284,31 +4293,31 @@ msgid ""
 msgstr ""
 "Parameter pre --flag nemá tvar <kľú�ové_slovo>:<�_param>:[pass-]<príznak>: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "štandardný vstup"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Nie ASCII znak na %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Nie ASCII komentár na alebo pred %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Nie ASCII reťazec na %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: upozornenie: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4317,7 +4326,7 @@ msgstr ""
 "Aj ke� je použité v pozícii formátovacieho reťazca, %s nie je platný "
 "formátovací reťazec %s. Dôvod: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4326,7 +4335,7 @@ msgstr ""
 "Aj ke� je to tak deklarované, %s nie je platný formátovací reťazec %s. "
 "Dôvod: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4340,7 +4349,7 @@ msgstr ""
 "Prosím, zvážte použitie formátovacieho reťazca s pomenovanými parametrami\n"
 "a mapovaním namiesto zoznamu parametrov.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4350,29 +4359,29 @@ msgstr ""
 "gettext(\"\") vráti hlavi�ku s meta informáciami\n"
 "a nie prázdny reťazec.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "nejednozna�ne zadaný parameter pre kľú�ové slovo '%.*s'"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "upozornenie: chýbajúci kontext pre kľú�ové slovo '%.*s'"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "upozornenie: chýbajúci kontext pre parameter množného �ísla kľú�ového slova "
 "'%.*s'"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "nezhoda kontextu medzi jednotným a množným �íslom"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4384,7 +4393,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS; inak prosím zadajte voľbu príkazového\n"
 "riadka --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "jazyk '%s' je neznámy"
@@ -4493,7 +4502,7 @@ msgstr "%s:%d: neplatná interpolácia (\"\\L\") 8-bitového znaku \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: neplatná interpolácia (\"\\U\") 8-bitového znaku \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4501,7 +4510,7 @@ msgstr ""
 "Prosím, zadajte kódovanie zdroja pomocou --from-code alebo pomocou\n"
 "komentára tak, ako je uvedené na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4512,7 +4521,7 @@ msgstr ""
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code alebo pomocou\n"
 "komentára tak, ako je uvedené na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4523,7 +4532,7 @@ msgstr ""
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code alebo pomocou\n"
 "komentára tak, ako je uvedené na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4534,7 +4543,7 @@ msgstr ""
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-codei alebo pomocou\n"
 "komentára tak, ako je uvedené na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4545,7 +4554,7 @@ msgstr ""
 "Prosím, zadajte správne kódovanie zdroja pomocou --from-code alebo pomocou\n"
 "komentára tak, ako je uvedené na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4556,22 +4565,22 @@ msgstr ""
 "Prosím, zadajte kódovanie zdroja pomocou --from-code alebo pomocou\n"
 "komentára tak, ako je uvedené na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Neznáme kódovanie \"%s\". Pokra�ujem namiesto neho s ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: neplatná definícia reťazca"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: chýbajúce �íslo za #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: neplatný výraz reťazca"
@@ -4716,6 +4725,3 @@ msgstr "v komentári alebo vykonávacom pokyne"
 #, c-format
 msgid "document ended unexpectedly: %s"
 msgstr "dokument skon�il neo�akávane: %s"
-
-#~ msgid "The root element <%s> is not allowed in a valid CLDR file"
-#~ msgstr "Koreňový element <%s> nie je dovolený v platnom súbore CLDR"
diff --git a/gettext-tools/po/sl.gmo b/gettext-tools/po/sl.gmo
index 2256d3d..43dfac1 100644
--- a/gettext-tools/po/sl.gmo
+++ b/gettext-tools/po/sl.gmo
diff --git a/gettext-tools/po/sl.po b/gettext-tools/po/sl.po
index a3466bd..b5a2df1 100644
--- a/gettext-tools/po/sl.po
+++ b/gettext-tools/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.19.7-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-12-26 16:49+0100\n"
 "Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -111,7 +111,7 @@ msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -189,15 +189,15 @@ msgstr "neveljaven argument source_version za compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "neveljaven argument target_version za compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ustvarjanje »%s« neuspešno"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -222,39 +222,39 @@ msgstr "V/I napaka v podprocesu %s"
 
 #  Morda ,,Zmanjkalo pomnilnika''?
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "zmanjkalo pomnilnika"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "ustvarjanje niti ni uspelo"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "posredovanje podatkov podprocesu %s neuspešno"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "branje izhoda podprocesa %s neuspešno"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "s podprocesom %s ni mogo�e vzpostaviti neblo�ne V/I povezave"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "povezava s podprocesom %s neuspešna"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "podproces %s zaklju�il z izhodno kodo %d"
@@ -293,18 +293,18 @@ msgstr "«"
 msgid "setting permissions for %s"
 msgstr "nastavljamo dovoljenja za %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "cevovoda ni mogo�e ustvariti"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "Klic _open_osfhandle neuspešen"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "ni mogo�e povrniti fd %d: klic dup2 ni uspel"
@@ -336,11 +336,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "Element <%s> nima prilastka <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za iz�rpnejša navodila\n"
@@ -366,7 +366,7 @@ msgstr ""
 "gettext. Če ni podan noben argument, se množinska pravila CLDR preberejo\n"
 "s standardnega vhoda.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -381,21 +381,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  izpiši množinska pravila v zapisu CLDR\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ta navodila\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               razli�ica programa\n"
@@ -405,20 +405,20 @@ msgstr "  -V, --version               razli�ica programa\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Morebitne napake v programu sporo�ite na <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -432,10 +432,10 @@ msgstr ""
 "Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Avtor(ica) %s.\n"
@@ -466,37 +466,37 @@ msgid "extra operand %s"
 msgstr "odve�ni operand %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "datoteke \"%s\" ni mo� odpreti za branje"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "formatno dolo�ilo za argument %u, kot v »%s«, v »%s« ne obstaja"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formatno dolo�ilo za argument %u ne obstaja v »%s«"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -533,8 +533,7 @@ msgstr ""
 "Niz se sklicuje na argument številka %u, vendar ne upošteva argumenta št. %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "števili formatnih dolo�il v »%s« in »%s« se ne ujemata"
@@ -855,8 +854,8 @@ msgstr "formatni dolo�ili v »%s« in »%s« nista enakovredni"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formatna dolo�ila v »%s« niso podmnožica tistih v »%s«"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "v »%2$s« ni formatnega dolo�ila za argument »%1$s«"
@@ -875,17 +874,17 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "V direktivi številka %u »%c« ne more za�enjati imena polja."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "V direktivi števika %u »%c« ne more za�enjati argumenta getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "V direktivi številka %u »%c« ne more za�enjati argumenta getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -893,12 +892,12 @@ msgstr ""
 "V direktivi Å¡tevilka %u ni dovoljeno nadaljnje gnezdenje formatnega "
 "dolo�ilnika."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "V direktivi številka %u je nezaklju�ena formatna direktiva."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -906,12 +905,12 @@ msgstr ""
 "Niz se sklicuje na argumente tako prek njihovih imen kot prek nepoimenovanih "
 "dolo�il argumentov."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Niz se sklicuje na argument »%s« na nezdružljive na�ine."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -919,7 +918,7 @@ msgstr ""
 "formatno dolo�ilo v »%s« zahteva preslikavo, tisto v »%s« pa pri�akuje n-"
 "ter�ek"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -927,13 +926,13 @@ msgstr ""
 "formatno dolo�ilo v »%s« zahteva n-ter�ek, tisto v »%s« pa pri�akuje "
 "preslikavo"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "formatno dolo�ilo za argument »%s«, kot v »%s«, v »%s« ne obstaja"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -990,7 +989,7 @@ msgid ""
 msgstr "Znak, ki zaklju�uje direktivo številka %u, ni števka med 1 in 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1038,11 +1037,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      internetni naslov za gostiteljsko ime\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativni izpis:\n"
@@ -1114,12 +1113,12 @@ msgstr "Krovni element ni »locatingRules«"
 msgid "at most one input file allowed"
 msgstr "dovoljena je najve� ena vhodna datoteka"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s in %s se med seboj izklju�ujeta"
@@ -1138,7 +1137,7 @@ msgstr ""
 "Filtriranje sporo�il iz kataloga prevodov glede na njihova dolo�ila\n"
 "in rokovanje z njimi.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1149,10 +1148,10 @@ msgstr ""
 "ÄŒe je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Izbira vhodne datoteke:\n"
@@ -1162,10 +1161,10 @@ msgstr "Izbira vhodne datoteke:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1180,23 +1179,23 @@ msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "ÄŒe vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Izbira izhodne datoteke:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=DATOTEKA  izhod zapisujemo v navedeno DATOTEKO\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1208,7 +1207,7 @@ msgstr ""
 "standardni\n"
 "izhod.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Izbira sporo�il:\n"
@@ -1331,9 +1330,9 @@ msgid ""
 msgstr ""
 "      --obsolete              isto kot --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1358,17 +1357,17 @@ msgstr ""
 "      --stringtable-input     skladnja vhodne datoteke je NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti izpisa:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1384,16 +1383,16 @@ msgstr ""
 "»auto«\n"
 "                              ali »html«\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=DATOTEKA-CSS    dolo�i slogovna pravila CSS za --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1401,9 +1400,9 @@ msgstr ""
 "  -e, --no-escape          brez ubežnih sekvenc v skladnji jezika C "
 "(privzeto)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1411,29 +1410,29 @@ msgstr ""
 "  -E, --escape                z ubežnimi sekvencami v skladnji C, brez\n"
 "                                razširjenega nabora znakov\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              vedno izpišemo datoteko PO, �etudi prazno\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent             izpis datoteke PO z zamiki\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location        brez vrstic »#: datoteka:vrstica« v izpisu\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1441,8 +1440,8 @@ msgstr ""
 "  -n, --add-location       z vrsticami »#: datoteka:vrstica« v izpisu "
 "(privzeto)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1450,32 +1449,32 @@ msgstr ""
 "      --strict             izpis v strogi obliki Uniforum, brez razširitev "
 "GNU\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     zapiši javansko datoteko .properties\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    zapiši NeXTstep/GNUstep datoteko .strings\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=Å TEVILO         Å¡irina strani pri izpisu, v znakih\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1484,32 +1483,32 @@ msgstr ""
 "      --no-wrap               sporo�il, daljših od širine strani, ne\n"
 "                              razlomi v ve� vrstic\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           izhod abecedno urejen po sporo�ilih\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file         izhod abecedno urejen po izvornih datotekah\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "dolo�eni kriteriji izbire niso mogo�i (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1531,26 +1530,26 @@ msgstr ""
 "ohranijo, razen �e z izbiro --use-first ne zahtevamo, da se ohranijo samo\n"
 "tisti iz prve datoteke PO, ki jih definira.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 "  VHODNA_DATOTEKA ...            vhodna datoteka (ali ve� vhodnih datotek)\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=DATOTEKA      seznam vhodnih datotek preberemo iz "
 "DATOTEKE\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "ÄŒe je vhodna datoteka enaka -, se bere standardni vhod.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1560,7 +1559,7 @@ msgstr ""
 "definicij\n"
 "                                 (privzeta vrednost je neskon�no)\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1570,7 +1569,7 @@ msgstr ""
 "definicij\n"
 "                                 (privzeta vrednost je 1)\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1579,7 +1578,7 @@ msgstr ""
 "  -u, --unique                   okrajšava za --less-than=2, izpišemo samo\n"
 "                                 enoli�no definirana sporo�ila\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1588,7 +1587,7 @@ msgstr ""
 "  -P, --properties-input      skladnja vhodnih datotek je javanska ."
 "properties\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1598,12 +1597,12 @@ msgstr ""
 "      --stringtable-input     skladnja vhodnih datotek je NeXTstep/GNUstep \n"
 "                              .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NABOR      nabor znakov izhodne datoteke\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1612,14 +1611,14 @@ msgstr ""
 "      --use-first          uporabimo prvi prevod sporo�ila, na katerega\n"
 "                             naletimo; ne združujemo ve� prevodov\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=KATALOG          nastavi polje 'Language' v zaglavju\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1724,7 +1723,7 @@ msgstr "to sporo�ilo je uporabljeno, a ne definirano v %s"
 msgid "warning: this message is not used"
 msgstr "opozorilo: to sporo�ilo ni uporabljeno"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1733,12 +1732,12 @@ msgstr[1] "%d kriti�na napaka"
 msgstr[2] "%d kriti�ni napaki"
 msgstr[3] "%d kriti�ne napake"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "podani morata biti vsaj dve datoteki"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1757,7 +1756,7 @@ msgstr ""
 "pri izvla�enju se ohranijo samo iz prve datoteke PO, ki jih definira. Položaji\n"
 "nizov v datotekah se ohranijo iz vseh datotek PO.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1767,7 +1766,7 @@ msgstr ""
 "definicij\n"
 "                                 (privzeta vrednost je 1)\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1817,7 +1816,7 @@ msgstr ""
 "      --strict                izpis v strogi obliki Uniforum brez "
 "razširitev\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "vhodna datoteka ni podana"
@@ -1999,76 +1998,76 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "izhod filtra ni zaklju�en z znakom NL"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argument %s mora biti eno samo lo�ilo"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "neveljaven vrstni red bajtov: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "vhodna datoteka ne sme biti podana ob izbirah %s ali %s"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s zahteva dolo�itev \"-d directory\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s zahteva dolo�itev »-l locale«"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s zahteva dolo�itev »--template vzorec«"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s zahteva dolo�itev »-o datoteka«"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s in %s se medsebojno izklju�ujeta v %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s je veljavno edino z %s ali %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s je veljavno edino z %s, %s ali %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "dostop do pravil ITS za %s ni možen"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -2077,7 +2076,7 @@ msgstr[1] "%d prevedeno sporo�ilo"
 msgstr[2] "%d prevedeni sporo�ili"
 msgstr[3] "%d prevedena sporo�ila"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -2086,7 +2085,7 @@ msgstr[1] ", %d ohlapni prevod"
 msgstr[2] ", %d ohlapna prevoda"
 msgstr[3] ", %d ohlapni prevodi"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -2095,27 +2094,27 @@ msgstr[1] ", %d neprevedeno sporo�ilo"
 msgstr[2] ", %d neprevedeni sporo�ili"
 msgstr[3] ", %d neprevedena sporo�ila"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Besedilni opis prevodov pretvorimo v binarni katalog sporo�il.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  datoteka.po ...             vhodne datoteke\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Na�in delovanja:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2124,7 +2123,7 @@ msgstr ""
 "  -j, --java                  javanski na�in: ustvarimo javanski razred\n"
 "                                ResourceBundle\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2133,12 +2132,12 @@ msgstr ""
 "      --java2                 kot --java, privzeta je java2 (JDK 1.2 ali "
 "ve�)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                na�in C#: ustvarimo .NET-datoteko .dll\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2146,19 +2145,19 @@ msgid ""
 msgstr ""
 "      --csharp-resources      na�in C#: ustvarimo .NET-datoteko z viri\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   na�in tcl: ustvarimo datoteko tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    na�in Qt: ustvarimo datoteko .qm za Qt\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2166,36 +2165,36 @@ msgstr ""
 "      --desktop               na�in Desktop Entry: ustvarimo datoteko ."
 "desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   na�in XML: ustvari datoteko XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                izpis v strogi obliki Uniforum brez razširitev "
 "GNU\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Če je izhodna datoteka enaka -, se rezultat izpiše na standardni izhod.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Izbira izhodne datoteke v javanskem na�inu:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=SREDSTVO     ime sredstva\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2203,7 +2202,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=JJ_DD          jezikovno okolje (jezik ali jezik_država)\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2212,13 +2211,13 @@ msgstr ""
 "      --source                namesto datoteke .class izdelaj datoteko ."
 "java\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2232,12 +2231,12 @@ msgstr ""
 "podani\n"
 "imenik.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Položaj izhodne datoteke v na�inu C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2246,7 +2245,7 @@ msgstr ""
 "  -d IMENIK                   korenski imenik za krajevno odvisne datoteke ."
 "dll\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2255,17 +2254,17 @@ msgstr ""
 "Izbiri -l in -d sta obvezni. Datoteka .dll se zapiše v podimenik podanega\n"
 "imenika; ime podimenika ustreza oznaki izbrane krajevne prilagoditve.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Izbira izhodne datoteke v na�inu tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2273,23 +2272,23 @@ msgid ""
 msgstr ""
 "Izbiri -l in  -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Izbire na�ina Desktop Entry:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "  --template=VZOREC           datoteka .desktop uporabljena kot vzorec\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d IMENIK                   korenski imenik datotek .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2298,7 +2297,7 @@ msgstr ""
 "  -kBESEDA, --keyword=BESEDA  uporabi BESEDO kot dodatno klju�o besedo\n"
 "  -k, --keyword[=BESEDA]      ne uporabljaj privzetih klju�nih besed\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2309,27 +2308,27 @@ msgstr ""
 "datoteke\n"
 "berejo iz navedenega imenika namesto iz argumentov ukazne vrstice.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Izbire na�ina XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=IME          prepoznaj navedeni jezik XML\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=VZOREC           datoteka XML uporabljena kot vzorec\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacija vhodne datoteke:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2340,20 +2339,20 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          preverimo od jezika odvisne formatne nize\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          preverimo obstoj in vsebino glave\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2362,7 +2361,7 @@ msgstr ""
 "      --check-domain          preverimo morebitna nesoglasja med direktivo\n"
 "                                domene in izbiro --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2371,7 +2370,7 @@ msgstr ""
 "  -C, --check-compatibility   preverimo združljivost GNU gettext z X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2381,13 +2380,13 @@ msgstr ""
 "      --check-accelerators[=ZNAK]  preverimo, ali obstajajo bližnjice za\n"
 "                                menujske izbire\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2395,7 +2394,7 @@ msgstr ""
 "  -a, --alignment=Å TEVILO     poravnava nizov na dano Å TEVILO bajtov "
 "(privzeto %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2409,7 +2408,7 @@ msgstr ""
 "strojnega\n"
 "                                okolja)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2417,83 +2416,83 @@ msgstr ""
 "      --no-hash               binarni katalog sporo�il bo brez razpršene "
 "tabele\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            s statistiko glede prevodov\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               z dodatnimi sporo�ili med izvajanjem\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "opozorilo: glava datoteke PO ni veljavna ali pa manjka\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "opozorilo: starejše izdaje msgfmt bodo pri tem javile napako\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "ime domene \"%s\" ni primerno kot ime datoteke: uporabimo predpono"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direktiva »domain %s« ni bila upoštevana"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "prazno polje »msgstr« ni bilo upoštevano"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ohlapni vnos za polje »msgstr« ni bil upoštevan"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s ne obstaja"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s obstaja, vendar se ne da prebrati"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "napaka pri branju \"%s\""
@@ -2742,12 +2741,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Slovenski prevodi paketa %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "trenutno izbrani nabor \"%s\" ni prenosljivo ime kodnega nabora"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "v vhodni datoteki sta dva razli�na nabora znakov, \"%s\" in \"%s\""
@@ -2767,14 +2766,14 @@ msgstr ""
 "domena \"%s\" v vhodni datoteki »%s« ne vsebuje glave z dolo�itvijo nabora "
 "znakov"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "opozorilo: "
@@ -2870,25 +2869,25 @@ msgstr ""
 "Izhod »%s« bo morda napa�en.\n"
 "Mogo�a rešitev za to težavo je, da nastavite LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "rezultat izraza za izbiro množinske oblike je lahko negativna vrednost"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, izraz za izbiro množinske oblike pa lahko da vrednosti do %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "izraz za izbiro množinske oblike lahko povzro�i deljenje z ni�"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "izraz za izbiro množinske oblike lahko povzro�i prekora�itev obsega"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2896,32 +2895,32 @@ msgstr ""
 "izraz za izbiro množinske oblike lahko povzro�i aritmeti�ne napake, morda\n"
 "deljenje z ni�"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Poskusite uporabiti naslednje, veljavno za %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "katalog sporo�il vsebuje množinske oblike prevodov,"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "v glavi pa manjka dolo�ilo \"plural=IZRAZ\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "v glavi pa manjka dolo�ilo \"nplurals=ŠTEVILO\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "neveljavna vrednost nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "neveljaven izraz za množinske oblike"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
@@ -2931,7 +2930,7 @@ msgstr "nplurals = %lu"
 # msgstr[1] "...nekatera sporo�ila pa imajo samo %lu množinsko obliko"
 # msgstr[2] "...nekatera sporo�ila pa imajo samo %lu množinski obliki"
 # msgstr[3] "...nekatera sporo�ila pa imajo samo %lu množinske oblike"
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2945,7 +2944,7 @@ msgstr[3] "nekatera sporo�ila pa imajo samo %lu množinske oblike"
 # msgstr[1] "...nekatera sporo�ila pa imajo %lu množinsko obliko"
 # msgstr[2] "...nekatera sporo�ila pa imajo %lu množinski obliki"
 # msgstr[3] "...nekatera sporo�ila pa imajo %lu množinske oblike"
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2954,7 +2953,7 @@ msgstr[1] "nekatera sporo�ila pa imajo %lu množinsko obliko"
 msgstr[2] "nekatera sporo�ila pa imajo %lu množinski obliki"
 msgstr[3] "nekatera sporo�ila pa imajo %lu množinske oblike"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2962,88 +2961,93 @@ msgstr ""
 "katalog sporo�il vsebuje množinske oblike, manjka pa glava z dolo�ili\n"
 "\"Plural-Forms: nplurals=Å TEVILO; plural=IZRAZ;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "polji »msgid« in »msgid_plural« se ne za�neta obe z »\\n«"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "polji »msgid« in »msgstr[%u]« se ne za�neta obe z »\\n«"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "polji »msgid« in »msgstr« se ne za�neta obe z »\\n«"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "polji »msgid« in »msgid_plural« se ne kon�ata obe z »\\n«"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "polji »msgid« in »msgstr[%u]« se ne kon�ata obe z »\\n«"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "polji »msgid« in »msgstr« se ne kon�ata obe z »\\n«"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "rokovanje z množinskimi oblikami je razširitev GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr manjka oznaka bližnjice »%c«"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "v msgstr je preve� oznak bližnjic »%c«"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "polje »%s« v glavi ima še vedno za�etne privzete vrednosti\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "v glavi manjka polje »%s«\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "tripi�je ASCII ('...') namesto unikoda"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "v uporabniškem vidnem nizu najden presledek pred tripi�jem"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "dvojni narekovaj ASCII uporabljen namesto unikoda"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "enojni narekovaj ASCII uporabljen namesto unikoda"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, fuzzy, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "tripi�je ASCII ('...') namesto unikoda"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: vhod ni veljaven v kodnem naboru »%s«"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: napaka pri pretvorbi iz nabora znakov \"%s\" v nabor \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "v vhodni datoteki manjka glava z dolo�ilom kodnega nabora"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3052,7 +3056,7 @@ msgstr ""
 "Pretvorba iz »%s« v »%s« ni mogo�a. %s kli�e iconv(), ta pa ne podpira te "
 "pretvorbe."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3061,8 +3065,8 @@ msgstr ""
 "Pretvorba iz »%s« v »%s« privede do podvojevanje: nekateri razli�ni klju�i "
 "msgid postanejo enaki."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3496,7 +3500,7 @@ msgstr "znak za konec vrstice sredi niza"
 msgid "context separator <EOT> within string"
 msgstr "razmejilnik konteksta <EOT> znotraj niza"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ta datoteka morda ne vsebuje direktiv domene"
@@ -3517,31 +3521,31 @@ msgstr "nezaklju�eno ime skupine"
 msgid "invalid non-blank character"
 msgstr "neveljaven nepresledni znak"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "manjka »=« za »%s«"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "neveljavna nepresledna vrstica"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "datoteka \"%s\" je okrnjena"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "datoteka \"%s\" vsebuje niz, ki ni zaklju�en z NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "datoteka \"%s\" ni v obliki GNU .mo"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "datoteka \"%s\" vsebuje pri %s niz, ki ni zaklju�en z NUL"
@@ -3722,25 +3726,25 @@ msgstr "prevajanje razreda C# neuspešno, poskusite z --verbose"
 msgid "compilation of C# class failed"
 msgstr "prevajanje razreda C# neuspešno"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "napaka pri odpiranju \"%s\" za pisanje"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ni veljavno javansko ime razreda: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "prevajanje javanskega razreda neuspešno, uporabite --verbose ali nastavite "
 "$JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
@@ -3852,12 +3856,12 @@ msgstr ""
 "katalog sporo�il vsebuje množinske oblike, vendar katalog sporo�il TCL\n"
 "ne podpira množinskih oblik\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: opozorilo: nezaklju�en niz"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: opozorilo: nezaklju�en regularni izraz"
@@ -3877,7 +3881,7 @@ msgstr "%s:%d: opozorilo: nezaklju�ena znakovna konstanta"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: opozorilo: nezaklju�en niz"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Prosim, dolo�ite vhodni nabor znakov z izbiro --from-code."
 
@@ -3917,7 +3921,7 @@ msgstr ""
 "%s:%d: Nezaklju�eno ve�bajtno zaporedje na koncu vrstice.\n"
 "Prosim, dolo�ite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: napaka v iconv"
@@ -3931,7 +3935,7 @@ msgstr ""
 "%s:%d: Neveljavno ve�bajtno zaporedje.\n"
 "Prosim, dolo�ite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
@@ -3953,37 +3957,37 @@ msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 "%s:%d: opozorilo: zaviti zaklepaj »}« na mestu, kjer pri�akujemo zaklepaj »)«"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "»%s« ni veljavno ime kodiranja. Namesto tega bo uporabljen ASCII.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "preverba skladnje »%s« ni poznana"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "neznan tip konca stavka »%s«"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "pri izpisu na standardni izhod ne moremo uporabiti --join-existing"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne deluje brez klju�nih besed, ki naj jih iš�e"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "opozorilo: datoteka »%s« s pravili ITS ne obstaja"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -3991,18 +3995,18 @@ msgstr ""
 "opozorilo: datoteka »%s« s pravili ITS ne obstaja; preverite svojo "
 "namestitev gettext"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "opozorilo: vrsta datoteka »%s« s pripono »%s« ni prepoznana; poskušamo C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Iz vhodnih datotek izvle�emo prevedljive nize znakov.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4010,25 +4014,25 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=DOMENA    namesto messages.po je privzeta  DOMENA.po\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output-file=DATOTEKA     izhod zapisujemo v navedeno DATOTEKO\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=IMENIK        izhodne datoteke pišemo v navedeni IMENIK\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Izbira vhodnega jezika:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4051,19 +4055,19 @@ msgstr ""
 "                                   RST, glade, lua, javascript, vala, "
 "desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   okrajšava za --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Privzeto se jezik poskusi uganiti iz pripone vhodne datoteke.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4072,23 +4076,23 @@ msgstr ""
 "      --from-code=NABOR       nabor znakov vhodnih datotek\n"
 "                                (razen za Python, Tcl in Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Privzeti nabor znakov vhodnih datotek je ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         združi sporo�ila z obstoje�o datoteko\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=DATOTEKA.po  vnosov iz navedene DATOTEKE ne izvle�emo\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4103,18 +4107,18 @@ msgstr ""
 "  -c, --add-comments          postavi vse komentarje pred vrsticami s \n"
 "                                klju�nimi besedami v izhodno datoteko\n"
 
-#: src/xgettext.c:1117
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=IME             izvedi preverjanje skladnje na sporo�ilih\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
 "                                 quote-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4124,17 +4128,17 @@ msgstr ""
 "      --sentence-end=TIP      tip konca stavka (single-space, kar je\n"
 "                                privzeta vrednost, ali double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Izbire, specifi�ne za jezik:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           iz datotek potegnemo vse nize\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4151,7 +4155,7 @@ msgstr ""
 "lua,\n"
 "                                javascript, vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4168,7 +4172,7 @@ msgstr ""
 "lua,\n"
 "                                javascript, vala, desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4178,7 +4182,7 @@ msgstr ""
 "      --flag=BESEDA:ARG:STIKALO  dodatno stikalo za nize znotraj argumenta\n"
 "                                 številka ARG klju�ne besede BESEDA\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4194,37 +4198,47 @@ msgstr ""
 "                                C#, awk, YCP, TCL, perl, PHP, GCC-vir, lua,\n"
 "                                javascript, vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             razumi trigrafe ANSI C na vhodu\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (samo jeziki C, C++ in predmetni C)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=DATOTEKA          izvedi pravila ITS iz DATOTEKE\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (samo jezik C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    prepoznaj oblikovne nize Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (samo jezik C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   prepoznaj oblikovne nize KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 prepoznaj oblikovne nize Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4232,29 +4246,24 @@ msgstr ""
 "      --debug                    bolj raz�lenjen rezultat razpoznave\n"
 "                                   oblikovnega niza\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapiši javansko datoteko .properties\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=DATOTEKA          izvedi pravila ITS iz DATOTEKE\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               izpiši komentarje itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=NIZ     v izhodu nastavimo nosilca avtorskih pravic "
 "na NIZ\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4262,18 +4271,18 @@ msgstr ""
 "      --foreign-user          brez copyrighta FSF v izpisu za tuje "
 "uporabnike\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    nastavi ime PAKETA na izhodu\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=NIZ      v izhodu nastavimo razli�ico paketa na NIZ\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4281,7 +4290,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOŠTA@NASLOV  naslov za sporo�ila o napakah "
 "msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4291,7 +4300,7 @@ msgstr ""
 "  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot predpono za "
 "msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4300,7 +4309,7 @@ msgid ""
 msgstr ""
 "  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot pripono za msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4308,31 +4317,31 @@ msgid ""
 msgstr ""
 "Argument --flag nima skladnje <klju�na-beseda>:<št-arg>:[pass-]<stikalo>: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standardni vhod"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Ne-ASCII znak pri %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Ne-ASCII komentar pri ali okoli %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Ne-ASCII niz pri %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: opozorilo: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4341,7 +4350,7 @@ msgstr ""
 "ÄŒeprav je uporabljen na mestu oblikovnega niza, %s ni veljaven oblikovni niz "
 "%s. Razlog: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4350,7 +4359,7 @@ msgstr ""
 "ÄŒeprav je deklariran kot tak, %s ni veljaven oblikovni niz za %s. Razlog: "
 "%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4363,7 +4372,7 @@ msgstr ""
 "Prosimo, razmislite o uporabi oblikovnega niza s poimenovanimi argumenti\n"
 "ter preslikave namesto n-ter�ka argumentov.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4373,28 +4382,28 @@ msgstr ""
 "gettext(\"\") vrne glavo z metapodatki, ne pa\n"
 "praznega niza.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "dvoumno dolo�en argument za klju�no besede »%.*s«"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "opozorilo: manjkajo�i kontekst za klju�no besedo »%.*s«"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "opozorilo: manjkajo�i kontekst za množinski argument klju�ne besede »%.*s«"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "neujemanje kontekstov med edninsko in množinsko obliko"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4406,7 +4415,7 @@ msgstr ""
 "spremenljivko MSGID_BUGS_ADDRESS tam, sicer pa \n"
 "z izbiro --msgid-bugs-address v ukazni vrstici.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "jezik »%s« ni poznan"
@@ -4515,7 +4524,7 @@ msgstr "%s:%d: neveljavna interpolacija (\"\\L\") osembitnega znaka \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: neveljavna interpolacija (\"\\U\") osembitnega znaka \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4524,7 +4533,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4536,7 +4545,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4548,7 +4557,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4560,7 +4569,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4572,7 +4581,7 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4584,22 +4593,22 @@ msgstr ""
 "komentarjem,\n"
 "kot je opisano na http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Neznani nabor znakov »%s«. Nadaljujemo z ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: neveljavna definicija niza"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: za # manjka Å¡tevilka"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: niz ni veljaven izraz"
diff --git a/gettext-tools/po/sr.gmo b/gettext-tools/po/sr.gmo
index 6f1868b..ee176d6 100644
--- a/gettext-tools/po/sr.gmo
+++ b/gettext-tools/po/sr.gmo
diff --git a/gettext-tools/po/sr.po b/gettext-tools/po/sr.po
index d1474d8..d9fda37 100644
--- a/gettext-tools/po/sr.po
+++ b/gettext-tools/po/sr.po
@@ -1,14 +1,14 @@
-# Serbian translation of gettext-tools, 2003—2015.
+# Serbian translation of gettext-tools, 2003—2016.
 # Copyright (C) 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Danilo Segan <dsegan@gmx.net>, 2003—2004.
-# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2013—2015.
+# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2013—2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools-0.19.7-rc1\n"
+"Project-Id-Version: gettext-tools-0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-23 21:22+0200\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-02 04:44+0200\n"
 "Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -17,7 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.7.1\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -111,7 +110,7 @@ msgid "Unknown system error"
 msgstr "�епозната грешка �и�тема"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -189,15 +188,15 @@ msgstr "неиÑ�праван аргумент издања_извора за пÑ
 msgid "invalid target_version argument to compile_java_class"
 msgstr "неи�праван аргумент издања_мете за преведи_јава_разред"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ни�ам у�пео да направим „%s“"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -224,39 +223,39 @@ msgid "%s subprocess I/O error"
 msgstr "У/И грешка %s потпроце�а"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "меморија је потрошена"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "�тварање нити није у�пело"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "пи�ање у %s потпроце� није у�пело"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "читање из %s потпроце�а није у�пело"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "не могу да по�тавим неблокирајући У/И за потпроце� %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "комуницирање �а %s потпроце�ом није у�пело"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s потпроце� је окончан �а излазном шифром %d"
@@ -296,18 +295,18 @@ msgid "setting permissions for %s"
 msgstr "подешавам овлашћења за %s"
 
 #
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "не могу да направим �појку"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "„_open_osfhandle“ није у�пело"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "не могу да повратим фд %d: „dup2“ није у�пело"
@@ -339,11 +338,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "Елемент <%s> нема атрибут <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Пробајте „%s --help“ за више података.\n"
@@ -368,7 +367,7 @@ msgstr ""
 "ЈЕЗИК из ПР�ВИЛ� и и�пи�ује их у облику погодном геттек�у за коришћење.\n"
 "�ко није дат ниједан аргумент, чита ЦЛДР правила множине �а �тандардног улаза.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -383,21 +382,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -c, --cldr                  и�пи�ује правила множине у ЦЛДР запи�у\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  приказује ову помоћ и излази\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               и�пи�ује податке о издању и излази\n"
@@ -407,20 +406,20 @@ msgstr "  -V, --version               иÑ�пиÑ�ује податке о издÐ
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Грешке пријавите на <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -434,10 +433,10 @@ msgstr ""
 "�е по�тоји �ИК�КВ� Г�Р��ЦИЈ�, у оквирима дозвољеним законом.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�апи�ао је %s.\n"
@@ -468,37 +467,37 @@ msgid "extra operand %s"
 msgstr "додатни операнд %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "грешка приликом отварања „%s“ за читање"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "о�обено�т запи�а за %u. аргумент, као у „%s“, не по�тоји у „%s“"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "о�обено�т запи�а за %u. аргумент не по�тоји у „%s“"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -534,8 +533,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "�и�ка упућује на %u. аргумент, али занемарује %u. аргумент."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "не подудара �е број о�обено�ти запи�а у „%s“ и „%s“"
@@ -843,8 +841,8 @@ msgstr "�пецификације запи�а у „%s“ и „%s“ ни�у
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "�пецификакције запи�а у „%s“ не пред�тављају под�куп оних из „%s“"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "о�обено�т запи�а за аргумент „%s“ не по�тоји у „%s“"
@@ -863,29 +861,29 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "У �мерници број %u, „%c“ не не може да започне назив поља."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "У �мерници број %u, „%c“ не не може да започне аргумент „getattr“."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "У �мерници број %u, „%c“ не не може да започне аргумент „getitem“."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
 "У �мерници број %u, није дозвољено више угнежђавања у одреднику запи�а."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "У �мерници број %u, по�тоји неокончана �мерница запи�а."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -893,30 +891,30 @@ msgstr ""
 "�и�ка упућује на аргументе и кроз називе аргумената и кроз неименоване "
 "наводе аргумената."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "�и�ка упућује на аргумент назива „%s“ на не�агла�не начине."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "о�обено�т запи�а у „%s“ очекује мапирање, а они у „%s“ очекују н-торку"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "о�обено�т запи�а у „%s“ очекује н-торку, а они у „%s“ очекују мапирање"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "о�обено�т запи�а за аргумент „%s“, као у „%s“, не по�тоји у „%s“"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -970,7 +968,7 @@ msgid ""
 msgstr "Знак којим �е завршава �мерница број %u није цифра између 1 и 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1017,11 +1015,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адре�е за назив рачунара\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Обавештајни излаз:\n"
@@ -1095,12 +1093,12 @@ msgstr "корени елемент није „locatingRules“"
 msgid "at most one input file allowed"
 msgstr "дозвољена је �амо једна улазна датотека"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s и %s �е међу�обно и�кључују"
@@ -1119,7 +1117,7 @@ msgstr ""
 "Издвајајте поруке каталога превода према њиховим о�обинама, и управљајте\n"
 "тим о�обинама.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1129,10 +1127,10 @@ msgid ""
 msgstr ""
 "Обавезни аргументи за дуге опције �у такође обавезни и за кратке опције.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Ме�то улазне датотеке:\n"
@@ -1142,10 +1140,10 @@ msgstr "Ме�то улазне датотеке:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  УЛ�З��Д�ТОТЕК�              улазна по датотека\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1159,23 +1157,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "�ко није дата улазна датотека или ако је „-“, чита �тандардни улаз.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Ме�то излазне датотеке:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=Д�ТОТЕК�  и�пи�ује излаз у наведену датотеку\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1187,7 +1185,7 @@ msgstr ""
 "или\n"
 "ако је „-“.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Избор поруке:\n"
@@ -1313,9 +1311,9 @@ msgstr ""
 "      --obsolete                 и�то што и --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1341,17 +1339,17 @@ msgstr ""
 "GNUstep\n"
 "                                 .strings“\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Поједино�ти излаза:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1366,18 +1364,18 @@ msgstr ""
 "„never“ (никада),\n"
 "                                 „auto“ (�амо�тално), или „html“.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=ИЗГЛЕДД�ТОТЕКЕ     наводи датотеку правила ЦСС изгледа за --"
 "color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1385,9 +1383,9 @@ msgstr ""
 "  -e, --no-escape                не кори�ти Ц знаке промене реда у излазу "
 "(задато)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1395,31 +1393,31 @@ msgstr ""
 "  -E, --escape                   кори�ти Ц знаке промене реда у излазу, без "
 "проширених знакова\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po                 запи�ује по датотеку чак и ако је празна\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                   запи�ује .по датотеку кори�тећи увучени "
 "изглед\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location              не и�пи�ује редове „#: датотека:ред“\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1427,8 +1425,8 @@ msgstr ""
 "  -n, --add-location             образује редове „#: датотека:"
 "ред“ (подразумевано)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1436,7 +1434,7 @@ msgstr ""
 "      --strict                   и�пи�ује .по датотеку изричито �кладну �а "
 "Унифорумом\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
@@ -1444,9 +1442,9 @@ msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output        и�пи�ује датотеку „Јава .properties“\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1454,16 +1452,16 @@ msgstr ""
 "      --stringtable-output       и�пи�ује датотеку „NeXTstep/GNUstep ."
 "strings“\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=БРОЈ               по�тавља ширину излазне �транице\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1473,31 +1471,31 @@ msgstr ""
 "ширине\n"
 "                                 излазне �транице, на неколико редова\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output              �твара уређени излаз\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file             ређа излаз према ме�ту датотеке\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "наведен је немогућ у�лов избора (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Употреба: %s [ОПЦИЈ�]... [УЛ�З��Д�ТОТЕК�]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1519,24 +1517,24 @@ msgstr ""
 "датотека ће �е збрајати, о�им ако не кори�тите „--use-first“, тада �е\n"
 "узимају из прве ПО датотеке која их одређује.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  УЛ�З��Д�ТОТЕК� ...          улазне датотеке\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=Д�ТОТЕК�   добавља �пи�ак улазних датотека из Д�ТОТЕКЕ\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "�ко је улазна датотека „-“, чита �е �тандардни улаз.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1545,7 +1543,7 @@ msgstr ""
 "  -<, --less-than=БРОЈ        и�пи�ује поруке �а мање од оволико одредница,\n"
 "                              подразумева �е бе�коначно ако није по�тављено\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1554,7 +1552,7 @@ msgstr ""
 "  -<, --more-than=БРОЈ        и�пи�ује поруке �а више од оволико одредница,\n"
 "                              подразумева �е 0 ако није по�тављено\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1563,7 +1561,7 @@ msgstr ""
 "  -u, --unique                �краћеница за „--less-than=2“, захтева\n"
 "                              штампање �амо једин�твених порука\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1572,7 +1570,7 @@ msgstr ""
 "  -P, --properties-input      улазне датотеке �у у �интак�и „Јава ."
 "properties“\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1583,12 +1581,12 @@ msgstr ""
 "GNUstep \n"
 "                              .strings“\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=��ЗИВ         кодирање за излаз\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1597,7 +1595,7 @@ msgstr ""
 "      --use-first             кори�ти први до�тупни превод за �ваку поруку,\n"
 "                              не �паја више превода\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1605,7 +1603,7 @@ msgstr ""
 "      --lang=��ЗИВК�Т�ЛОГ�    по�тавља поље „Language“ (језик) у заглављу\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Питер Милер"
 
@@ -1709,7 +1707,7 @@ msgstr "ова порука �е кори�ти али није одређена
 msgid "warning: this message is not used"
 msgstr "упозорење: ова порука �е не кори�ти"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1717,12 +1715,12 @@ msgstr[0] "нађох %d кобну грешку"
 msgstr[1] "нађох %d кобне грешке"
 msgstr[2] "нађох %d кобних грешака"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "најмање две датотеке морају бити наведене"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1742,7 +1740,7 @@ msgstr ""
 "примедбе ће бити �ачуване, али �амо из прве ПО датотеке која их\n"
 "одређује.  Положаји датотека из �вих ПО датотека ће �е збрајати.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1751,7 +1749,7 @@ msgstr ""
 "  ->, --more-than=БРОЈ        и�пи�ује поруке �а више од оволико одредница,\n"
 "                              подразумева �е 1 ако није по�тављено\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1798,7 +1796,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                изричито Униорум�ки �тил излаза\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "није дата улазна датотека"
@@ -1981,76 +1979,76 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "излаз пропу�ника није окончан новим редом"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент за „%s“ треба да буде знак једне тачке"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неи�праван поредак од мањег: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Улрих Дрепер"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "не треба бити дата ниједна улазна датотека ако �у наведени „%s“ и „%s“"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "„%s“ захтева одредницу „-d директоријум“"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "„%s“ захтева одредницу „-l језик“"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "„%s“ захтева одредницу „--template шаблон“"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "„%s“ захтева одредницу „-o датотека“"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "„%s“ и „%s“ �е међу�обно и�кључују у „%s“"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s је и�правно �амо �а %s или %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s је и�правно �амо �а %s, %s или %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "не могу да пронађем „ITS“ правила за „%s“"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -2058,7 +2056,7 @@ msgstr[0] "%d преведена порука"
 msgstr[1] "%d преведене поруке"
 msgstr[2] "%d преведених порука"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -2066,7 +2064,7 @@ msgstr[0] ", %d неј�ан превод"
 msgstr[1] ", %d неја�на превода"
 msgstr[2] ", %d неј�аних превода"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -2074,27 +2072,27 @@ msgstr[0] ", %d непреведена порука"
 msgstr[1] ", %d непреведене поруке"
 msgstr[2] ", %d непреведених порука"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Употреба: %s [ОПЦИЈ�] датотека.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Створите бинарни каталог порука из тек�туалног опи�а превода.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  датотека.po ...             улазне датотеке\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "�ачин рада:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2103,7 +2101,7 @@ msgstr ""
 "  -j, --java                  режим Јаве: �твара Јавин разред „Група "
 "изворишта“\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2112,13 +2110,13 @@ msgstr ""
 "      --java2                 као --java, и претпо�тавља Јаву2 (ЈДК 1.2 или "
 "новији)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                Ц# режим: �твара .�ЕТ-ову „.dll“ датотеку\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2127,7 +2125,7 @@ msgstr ""
 "      --csharp-resources      Режим Ц# изворишта: �твара .�ЕТ-ову „."
 "resources“ датотеку\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2135,13 +2133,13 @@ msgstr ""
 "      --tcl                   Тцл режим: �твара тцл/м�гкат-ову „.msg“ "
 "датотеку\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 "      --qt                    Кут режим: �твара Кутову „.qm“ датотеку\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2149,33 +2147,33 @@ msgstr ""
 "      --desktop               Режим Де�ктоп уно�а: �твара „.desktop“ "
 "датотеку\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   Ик�МЛ режим: �твара Ик�МЛ датотеку\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                укључује изричити режим Унифорума\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "�ко је излазна датотека -, излаз �е запи�ује на �тандардни излаз.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Путања излазне датотеке у Јава режиму:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ИЗВОРИШТЕ    назив изворишта\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2183,7 +2181,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=ЛОК�ЛИТЕТ      назив локалитета, било језик или језик_ДРЖ�В�\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2191,7 +2189,7 @@ msgid ""
 msgstr ""
 "      --source                �твара датотеку „.java“ уме�то „.class“\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
@@ -2199,7 +2197,7 @@ msgstr ""
 "  -d ДИРЕКТОРИЈУМ             о�новни директоријум за хијерархију \n"
 "                              директоријума разреда\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2212,12 +2210,12 @@ msgstr ""
 "раздвојено подвлаком.  Опција -d је обавезна.  Разред �е упи�ује под\n"
 "наведеним директоријумом.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Путања излазне датотеке у Ц# режиму:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2226,7 +2224,7 @@ msgstr ""
 "  -d ДИРЕКТОРИЈУМ             о�новни директоријум за .dll датотеке од "
 "локалитета зави�не\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2235,18 +2233,18 @@ msgstr ""
 "Опције -l и -d �у обавезне.  Датотека .dll �е упи�ује у поддиректоријум\n"
 "датог директоријума чији назив зави�и од локалитета.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Путања излазне датотеке у Тцл режиму:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d ДИРЕКТОРИЈУМ             о�новни директоријум каталога .msg порука\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2254,25 +2252,25 @@ msgid ""
 msgstr ""
 "Опције -l и -d �у обавезне.  Датотека .msg �е упи�ује у дати директоријум.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Могућно�ти режима Де�ктоп уно�а:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "  --template=Ш�БЛО�                 „.desktop“ датотека која �е кори�ти као "
 "шаблон\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr ""
 "  -d ДИРЕКТОРИЈУМ                   о�новни директоријум „.po“ датотека\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2281,7 +2279,7 @@ msgstr ""
 "  -kРЕЧ, --keyword=РЕЧ              тражи РЕЧ као додатну кључну реч\n"
 "  -k, --keyword                     не кори�ти задате кључне речи\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2291,29 +2289,29 @@ msgstr ""
 "Опције „-l“, „-o“ и „--template“ �у обавезне.  �ко је наведено „-D“, улазне\n"
 "датотеке �е читају из директоријума уме�то из аргумената линије наредби.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Могућно�ти режима Ик�МЛ-а:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=��ЗИВ              препознаје наведени Ик�МЛ језик\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 "  --template=Ш�БЛО�                 Ик�МЛ датотека која �е кори�ти као "
 "шаблон\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Тумачење улазне датотеке:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2324,14 +2322,14 @@ msgstr ""
 "                                   --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format               проверава ни�ке запи�а у зави�но�ти од "
 "језика\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2339,7 +2337,7 @@ msgid ""
 msgstr ""
 "      --check-header               проверава при�у�тво и �адржај заглавља\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2349,7 +2347,7 @@ msgstr ""
 "и\n"
 "                                   опције „--output-file“\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2359,7 +2357,7 @@ msgstr ""
 "као \n"
 "                                   Ик�/Опен м�гфмт\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2369,12 +2367,12 @@ msgstr ""
 "      --check-accelerators[=З��К]  проверава при�у�тво пречица та�татуре "
 "у                                  �тавкама изборника\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy                  кори�ти неја�не уно�е на излазу\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2382,7 +2380,7 @@ msgstr ""
 "  -a, --alignment=БРОЈ             поравнава ни�ке на БРОЈ бајтова (обично: "
 "%d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2395,7 +2393,7 @@ msgstr ""
 "                                   (велики или мали, у зави�но�ти од "
 "платформе)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2403,83 +2401,83 @@ msgstr ""
 "      --no-hash                    бинарна датотека неће �адржати хеш "
 "табелу\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics                 и�пи�ује �тати�тику о преводима\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose                    повећава ниво опширно�ти\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "упозорење: заглавље по датотеке недо�таје или је неи�правно\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "упозорење: претварање �купа знакова неће радити\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "упозорење: заглавље по датотеке је неја�но\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "упозорење: �тарија издања м�гфмт-а ће овде наићи на грешку\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "назив домена „%s“ није прикладан за назив датотеке"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "назив домена „%s“ није прикладан за назив датотеке: кори�тићу префик�"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "�мерница „domain %s“ је занемарена"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "празан „msgstr“ уно� је занемарен"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "неја�ан „msgstr“ уно� је занемарен"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: упозорење: изворна датотека �адржи неја�ан превод"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "�е по�тоји „%s“"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "„%s“ по�тоји али је не могу прочитати"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при читању „%s“"
@@ -2722,12 +2720,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Преводи на �рп�ки језик за пакет „%s“"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "при�утни �куп знакова „%s“ није назив прено�ивог кодирања"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "два различита �купа знакова „%s“ и „%s“ у улазној датотеци"
@@ -2747,14 +2745,14 @@ msgstr ""
 "домен „%s“ у улазној датотеци „%s“ не �адржи поље заглавља �а ознаком �купа "
 "знакова"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "одредишни �куп знакова „%s“ није назив прено�ивог кодирања."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "упозорење: "
@@ -2848,61 +2846,61 @@ msgstr ""
 "Излаз за „%s“ може бити нетачан.\n"
 "Могуће решење је да по�тавите „LC_ALL=C“.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "израз за множине може дати негативне вредно�ти"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "„nplurals = %lu“ али израз за множине може дати чак и вредно�ти %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "израз за множине може дати дељење нулом"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "израз за множине може проузроковати прекорачење целих бројева"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "израз за множине може проузроковати аритметичке изузетке, нпр. дељење нулом"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Покушајте да кори�тите �ледеће, и�правно за %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "каталог порука �адржи преводе облика за множину"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "али у заглављу недо�таје поље „plural=ИЗР�З“"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "али у заглављу недо�таје поље „nplurals=БРОЈ“"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "неи�правна вредно�т за број множина"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "неи�праван израз множине"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2910,7 +2908,7 @@ msgstr[0] "али неке поруке имају �амо %lu облик за
 msgstr[1] "али неке поруке имају �амо %lu облика за множину"
 msgstr[2] "али неке поруке имају �амо %lu облика за множину"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2918,7 +2916,7 @@ msgstr[0] "али неке поруке имају %lu облик за множÐ
 msgstr[1] "али неке поруке имају %lu облика за множину"
 msgstr[2] "али неке поруке имају %lu облика за множину"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2926,88 +2924,93 @@ msgstr ""
 "каталог порука �адржи преводе облика множине, али нема поља заглавља „Plural-"
 "Forms: nplurals=БРОЈ; plural=ИЗР�З;“"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "„msgid“ и „msgid_plural“ не почињу оба �а „\\n“"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "„msgid“ и „msgstr[%u]“ не почињу оба �а „\\n“"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "„msgid“ и „msgstr“ не почињу оба �а „\\n“"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "„msgid“ и „msgid_plural“ не завршавају �е оба �а „\\n“"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "„msgid“ и „msgstr[%u]“ не завршавају �е оба �а „\\n“"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "„msgid“ и „msgstr“ не завршавају �е оба �а „\\n“"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "баратање множинама је проширење Гнуовог геттек�та"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "У м�г�тр недо�таје ознака пречице та�татуре „%c“"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "У м�г�тр има превише ознака пречица та�татуре „%c“"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "поље заглавља „%s“ и даље �адржи почетну задату вредно�т\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "у заглављу недо�таје поље заглавља „%s“\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "�СКРИ тротачка (...) уме�то Јуникода"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "пронађен је размак пре тротачке у ни�кама које види кори�ник"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "коришћен је �СКРИ дво�труки наводник уме�то Јуникода"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "коришћен је �СКРИ једно�труки наводник уме�то Јуникода"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "�СКРИ метак (%c) уме�то Јуникода"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: улаз није и�праван у „%s“ кодирању"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: грешка приликом претварања „%s“ кодирања у „%s“ кодирање"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека не �адржи поље заглавља �а ознаком �купа знакова"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3016,7 +3019,7 @@ msgstr ""
 "�е могу да претворим из „%s“ у „%s“. %s �е о�лања на иконв(), а иконв() не "
 "подржава ово претварање."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3025,8 +3028,8 @@ msgstr ""
 "Претварање из „%s“ у „%s“ уводи понављања: неке различите м�гид поруке "
 "по�тају једнаке."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3458,7 +3461,7 @@ msgstr "знак за крај реда унутар ни�ке"
 msgid "context separator <EOT> within string"
 msgstr "�адржајни раздвајач <ЕОТ> унутар ни�ке"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ова датотека не може да �адржи �мернице домена"
@@ -3479,31 +3482,31 @@ msgstr "неокончани назив групе"
 msgid "invalid non-blank character"
 msgstr "неи�праван не-празан знак"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "недо�таје = након „%s“"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "неи�праван не-празан ред"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "датотека „%s“ је �краћена"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "датотека „%s“ �адржи ни�ку која није окончана �УЛ-ом"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "датотека „%s“ није у Гнуовом .mo запи�у"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "датотека „%s“ �адржи ни�ку која није окончана �УЛ-ом, на %s"
@@ -3684,25 +3687,25 @@ msgstr "изграђивање Ц# разреда није уÑ�пело, проÐ
 msgid "compilation of C# class failed"
 msgstr "изграђивање Ц# разреда није у�пело"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "грешка приликом отварања „%s“ за пи�ање"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "неи�праван назив разреда Јаве: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "изграђивање разреда Јаве није у�пело, пробајте „--verbose“ или по�тавите "
 "„$JAVAC“"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "изграђивање разреда Јаве није у�пело, пробајте да по�тавите „$JAVAC“"
@@ -3810,12 +3813,12 @@ msgstr ""
 "каталог порука �адржи преводе облика множине\n"
 "али запи� каталога порука Тцл-а не подржава руковање множинама\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: упозорење: неокончана ни�ка"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: упозорење: неокончани регуларни израз"
@@ -3835,7 +3838,7 @@ msgstr "%s:%d: упозорење: кон�танта знака није око
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: упозорење: литерал ни�ке није окончан"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "�аведите кодирање извора помоћу „--from-code“."
 
@@ -3875,7 +3878,7 @@ msgstr ""
 "%s:%d: �едовршени низ мултибајтова на крају реда.\n"
 "�аведите и�правно кодирање извора помоћу „--from-code“.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: неу�пех иконв-а"
@@ -3889,7 +3892,7 @@ msgstr ""
 "%s:%d: �еи�праван низ мултибајтова.\n"
 "�аведите кодирање извора помоћу „--from-code“.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: упозорење: неи�праван знак Уникода"
@@ -3909,39 +3912,39 @@ msgstr "%s:%d: упозорење: нађох ) где очекивах }"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: упозорење: нађох } где очекивах )"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "„%s“ није и�праван назив кодирања.  Кори�тићу �СКРИ.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "провера �интак�е „%s“ је непозната"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "вр�та краја реченице „%s“ је непозната"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "„--join-existing“ �е не може кори�тити када �е излаз и�пи�ује на �тандардни "
 "излаз"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "„xgettext“ не може да ради без кључних речи које тражи"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "упозорење: не по�тоји датотека „%s“ „ITS“ правила"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -3949,17 +3952,17 @@ msgstr ""
 "упозорење: не по�тоји датотека „%s“ „ITS“ правила; проверите ин�талацију "
 "геттек�та"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "упозорење: проширење „%2$s“ датотеке „%1$s“ није познато; пробаћу Ц"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извуците преводиве ни�ке из датих улазних датотека.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3968,13 +3971,13 @@ msgstr ""
 "  -d, --default-domain=��ЗИВ        кори�ти ��ЗИВ.po за излаз (уме�то "
 "messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=Д�ТОТЕК�             и�пи�ује излаз у наведену датотеку\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3982,12 +3985,12 @@ msgstr ""
 "  -p, --output-dir=ДИР              излазне датотеке �е �мештају у "
 "директоријум ДИР\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избор језика улазне датотеке:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4007,12 +4010,12 @@ msgstr ""
 "                                    РСТ, Глејд, Луа, ЈаваСпи�, Вала, "
 "Де�ктоп)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                         �краћеница за „--language=Ц++“\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4020,7 +4023,7 @@ msgid ""
 msgstr ""
 "Подразумева �е погађање језика на о�нову проширења назива улазне датотеке.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4029,24 +4032,24 @@ msgstr ""
 "      --from-code=��ЗИВ             кодирање улазних датотека\n"
 "                                    (о�им за Питона, Тцл-а, Глејд-а)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Подразумева �е да �у улазне датотеке у �СКРИ запи�у.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing               �паја поруке �а по�тојећом датотеком\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=Д�ТОТЕК�.po    поља из Д�ТОТЕКЕ.po �е не извлаче\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4063,18 +4066,18 @@ msgstr ""
 "редова\n"
 "                                    кључних речи у излазној датотеци\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=��ЗИВ            обавља проверу �интак�е у порукама\n"
 "                                (тротачка-јуникод, размак-тротачка,\n"
-"                                 наводник-јуникод)\n"
+"                                 наводник-јуникод, метак-јуникод)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4085,17 +4088,17 @@ msgstr ""
 "                                (један-размак, који је о�новни, \n"
 "                                 или дво�труки-размак)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "По�ебне наредбе језика:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all                 извлачи �ве ни�ке\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4110,7 +4113,7 @@ msgstr ""
 "извор,\n"
 "                                    Луа, ЈаваСпи�, Вала)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4125,7 +4128,7 @@ msgstr ""
 "извор,\n"
 "                                    Луа, ЈаваСпи�, Вала, Де�ктоп)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4135,7 +4138,7 @@ msgstr ""
 "      --flag=РЕЧ:�РГ:ОБЕЛЕЖЈЕ       додатно обележје за ни�ке унутар броја\n"
 "                                    аргумента �РГ кључне речи РЕЧ\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4149,37 +4152,48 @@ msgstr ""
 "                                    Јава, Ц#, авк, ЈЦП, Тцл, Перл, ПХП,\n"
 "                                    ГЦЦ-извор, Луа, ЈаваСпи�, Вала)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs                   разуме ��СИ Ц триграфе за улаз\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                    (�амо језици Ц, Ц++, ОбјектниЦ)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=Д�ТОТЕК�           примењује „ITS“ правила из Д�ТОТЕКЕ\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+"                                    (�амо језици за�новани на Ик�МЛ-у)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                          препознаје ни�ке запи�а Кут-а\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                    (�амо језик Ц++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                         препознаје ни�ке запи�а КДЕ-а 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                       препознаје ни�ке запи�а Бу�т-а\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4187,30 +4201,25 @@ msgstr ""
 "      --debug                       опширнији резултат препознавања запи�а "
 "ни�ке\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output           и�пи�ује датотеку Јава „.properties“\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=Д�ТОТЕК�           примењује „ITS“ правила из Д�ТОТЕКЕ\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               запи�ује напомене ит�-алата\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=�ИСК�      по�тавља но�иоца аутор�ких права у "
 "излазу\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4218,17 +4227,17 @@ msgstr ""
 "      --foreign-user                избацује аутор�ка права ФСФ у излазу за "
 "�тране кори�нике\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=П�КЕТ          по�тавља назив пакета на излазу\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=ИЗД�ЊЕ      по�тавља издање пакета на излазу\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4237,7 +4246,7 @@ msgstr ""
 "пријављивање \n"
 "                                           грешака у м�гид-овима\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4247,7 +4256,7 @@ msgstr ""
 "  -m[�ИСК�], --msgstr-prefix[=�ИСК�]   кори�ти �ИСК� или „“ за префик� поља "
 "м�г�тр-а\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4257,7 +4266,7 @@ msgstr ""
 "  -M[�ИСК�], --msgstr-suffix[=�ИСК�]   кори�ти �ИСК� или „“ за �уфик� поља "
 "м�г�тр-а\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4266,31 +4275,31 @@ msgstr ""
 "�ргумент „--flag“ не кори�ти �интак�у <кључна-реч>:<бр.арг>:"
 "[пролаз-]<обележје>: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "�тандардни улаз"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "�е-�СКРИ знак на %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "�е-�СКРИ напомена на или пре %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "�е-�СКРИ ни�ка на %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: упозорење: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4299,7 +4308,7 @@ msgstr ""
 "Иако �е кори�ти на ме�ту ни�ке запи�а, %s не пред�тавља и�правну ни�ку "
 "запи�а %s. Разлог: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4308,7 +4317,7 @@ msgstr ""
 "Иако је објављена као таква, %s не пред�тавља и�правну ни�ку запи�а %s. "
 "Разлог: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4322,7 +4331,7 @@ msgstr ""
 "Размотрите употребу ни�ку заои�а �а именованим аргументима,\n"
 "и �а мапирањем уме�то н-торке за аргументе.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4332,27 +4341,27 @@ msgstr ""
 "„gettext(\"\")“ и�пи�ује поље заглавља �а мета-подацима, а не\n"
 "празну ни�ку.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неја�ана о�обено�т аргумента за кључну реч „%.*s“"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "упозорење: недо�таје контек�т за кључниу реч „%.*s“"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "упозорење: недо�таје контек�т за аргумент множине кључне речи „%.*s“"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "контек�т �е разликује између облика за једнину и множину"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4364,7 +4373,7 @@ msgstr ""
 "променљиву „MSGID_BUGS_ADDRESS“; у �упротном наведите\n"
 "опцију „--msgid-bugs-address“ у наредби.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "језик „%s“ је непознат"
@@ -4475,7 +4484,7 @@ msgstr "%s:%d: неи�правно уметање („\\L“) 8-битног з
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неи�правно уметање („\\U“) 8-битног знака „%c“"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4483,7 +4492,7 @@ msgstr ""
 "�аведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4494,7 +4503,7 @@ msgstr ""
 "�аведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4505,7 +4514,7 @@ msgstr ""
 "�аведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4516,7 +4525,7 @@ msgstr ""
 "�аведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4527,7 +4536,7 @@ msgstr ""
 "�аведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4538,22 +4547,22 @@ msgstr ""
 "�аведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
 "као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "�епознато кодирање „%s“. �а�тављам �а �СКРИ-јем."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неи�правна одредница датотеке"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: недо�таје број након #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неи�праван израз ни�ке"
@@ -4701,9 +4710,6 @@ msgstr "документ је завршио неочекивано: %s"
 #~ msgid "Missing context for the string extracted from '%s' element"
 #~ msgstr "�едо�таје �адржај за ни�ку извучену из елемента „%s“"
 
-#~ msgid "%s:%lu:%lu: %s"
-#~ msgstr "%s:%lu:%lu: %s"
-
 #~ msgid ""
 #~ "Language \"glade\" is not supported. %s relies on expat.\n"
 #~ "This version was built without expat.\n"
diff --git a/gettext-tools/po/sv.gmo b/gettext-tools/po/sv.gmo
index 2cb2142..385a980 100644
--- a/gettext-tools/po/sv.gmo
+++ b/gettext-tools/po/sv.gmo
diff --git a/gettext-tools/po/sv.po b/gettext-tools/po/sv.po
index c28ad92..1cd0aa3 100644
--- a/gettext-tools/po/sv.po
+++ b/gettext-tools/po/sv.po
@@ -1,15 +1,18 @@
 # Swedish messages for gettext-tools
-# Copyright © 1996, 1997, 1998, 2001, 2002, 2003, 2007, 2010, 2013, 2014 Free Software Foundation, Inc.
+# Copyright © 1996, 1997, 1998, 2001, 2002, 2003, 2007, 2010, 2013, 2014, 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
+#
 # Jan Djärv <jan.h.d@swipnet.se>, 1998, 2001, 2002, 2003, 2006, 2007, 2010, 2013, 2014
+# Göran Uddeborg <goeran@uddeborg.se>, 2016.
 #
+# $Revision: 1.4 $
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.3\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2014-10-17 22:56+0200\n"
-"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-06 19:03+0200\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -108,7 +111,7 @@ msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -120,9 +123,9 @@ msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%s: flaggan \"%s\" är tvetydig, alternativ:"
 
 #: gnulib-lib/getopt.c:619
-#, fuzzy, c-format
+#, c-format
 msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
+msgstr "%s: flaggan �%s� är tvetydig\n"
 
 #: gnulib-lib/getopt.c:654 gnulib-lib/getopt.c:658
 #, c-format
@@ -137,7 +140,7 @@ msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
 #: gnulib-lib/getopt.c:715 gnulib-lib/getopt.c:734
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flaggan \"%s\" kräver ett argument\n"
+msgstr "%s: flaggan �--%s� kräver ett argument\n"
 
 #: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
 #, c-format
@@ -186,15 +189,15 @@ msgstr "ogiltigt värde på argumentet source_version till compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ogiltigt värde på argumentet target_version till compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "misslyckades med att skapa \"%s\""
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -218,39 +221,39 @@ msgid "%s subprocess I/O error"
 msgstr "I/O-fel i %s-barnprocess"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "skapa trådar misslyckades"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "skrivning till %s-barnprocess misslyckades"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "läsning från %s-barnprocess misslyckades"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "kan inte initiera icke-blockerande I/O till barnprocess %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "kommunikation med %s-barnprocess misslyckades"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s-barnprocess terminerade med slutstatus %d"
@@ -278,29 +281,29 @@ msgstr "%s-barnprocess terminerade med slutstatus %d"
 #. and use glyphs suitable for your language.
 #: gnulib-lib/quotearg.c:347
 msgid "`"
-msgstr "\""
+msgstr "�"
 
 #: gnulib-lib/quotearg.c:348
 msgid "'"
-msgstr "\""
+msgstr "�"
 
 #: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr "sätter rättigheter för %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "kan inte skapa rör"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle misslyckades"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan inte återställa filnummer %d: dup2 misslyckades"
@@ -319,32 +322,32 @@ msgstr "%s-barnprocess fick ödesdiger signal %d"
 #: src/cldr-plurals.c:69
 #, c-format
 msgid "The root element must be <%s>"
-msgstr ""
+msgstr "Rotelementet måste vara <%s>"
 
 #: src/cldr-plurals.c:83
-#, fuzzy, c-format
+#, c-format
 msgid "The element <%s> does not contain a <%s> element"
-msgstr "Rotelementet <%s> är inte tillåten i en giltig Glade-fil"
+msgstr "Elementet <%s> innehåller inte ett <%s>-element"
 
 #: src/cldr-plurals.c:105 src/cldr-plurals.c:146
 #, c-format
 msgid "The element <%s> does not have attribute <%s>"
-msgstr ""
+msgstr "Elementet <%s> har inte attributet <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
 #: src/cldr-plurals.c:195
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION...] [LOCALE RULES]...\n"
-msgstr "Användning: %s [FLAGGA] [FIL]...\n"
+msgstr "Användning: %s [FLAGGA…] [LOKALREGLER]…\n"
 
 #: src/cldr-plurals.c:200
 #, c-format, no-wrap
@@ -355,8 +358,13 @@ msgid ""
 "LOCALE from RULES and print them in a form suitable for gettext use.\n"
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
+"Extrahera eller konvertera Unicode CLDR plural-regler.\n"
+"\n"
+"Om både LOKAL och REGLER anges, läser den CLDR plural-regler för\n"
+"LOKAL från REGLER och skriv dem i en form som passar för gettext att använda.\n"
+"Om inget argument anges, läser den CLDR plural-regler från standard in.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -366,26 +374,26 @@ msgstr ""
 "Motsvarande gäller för frivilliga argument.\n"
 
 #: src/cldr-plurals.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
-msgstr "  -h, --help                  visa denna hjälptext och avsluta\n"
+msgstr "  -c, --cldr                  skriv pluralregler i formatet CLDR\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  visa denna hjälptext och avsluta\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               visa versionsinformation och avsluta\n"
@@ -395,11 +403,11 @@ msgstr "  -V, --version               visa versionsinformation och avsluta\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapportera fel till <bug-gnu-gettext@gnu.org>.\n"
@@ -407,11 +415,11 @@ msgstr ""
 "se>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -425,10 +433,10 @@ msgstr ""
 "Det finns inte NÅGON SOM HELST GARANTI, till den grad som lagen tillåter.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrivet av %s.\n"
@@ -436,41 +444,41 @@ msgstr "Skrivet av %s.\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/cldr-plurals.c:295
 msgid "Daiki Ueno"
-msgstr ""
+msgstr "Daiki Ueno"
 
 #: src/cldr-plurals.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "%s cannot be read"
-msgstr "%s finns men kan inte läsas"
+msgstr "%s kan inte läsas"
 
 #: src/cldr-plurals.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "cannot extract rules for %s"
-msgstr "kan inte ta bort temporärkatalog %s"
+msgstr "kan inte extrahera regler för %s"
 
 #: src/cldr-plurals.c:331
 #, c-format
 msgid "cannot parse CLDR rule"
-msgstr ""
+msgstr "kan inte tolka CLDR-regel"
 
 #: src/cldr-plurals.c:366
 #, c-format
 msgid "extra operand %s"
-msgstr ""
+msgstr "extra operand %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fel uppstod när \"%s\" öppnades för läsning"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -478,19 +486,19 @@ msgstr ""
 "formateringsdirektiv för argument %u, som i \"%s\", finns inte i \"%s\""
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formateringsdirektiv för argument %u finns inte i \"%s\""
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -531,8 +539,7 @@ msgstr ""
 "Strängen refererar till argument nummer %u men ignorerar argument nummer %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antalet formateringsdirektiv i \"%s\" och \"%s\" är olika"
@@ -752,25 +759,27 @@ msgstr ""
 "formateringsdirektiv i \"%s\" och \"%s\" för argument {%u} är inte likadana"
 
 #: src/format-kde.c:159
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The string refers to argument number %u but ignores the arguments %u and %u."
 msgstr ""
-"Strängen refererar till argument nummer %u men ignorerar argument nummer %u."
+"Strängen refererar till argument nummer %u men ignorerar argument nummer %u "
+"och %u."
 
 #: src/format-kde.c:243
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "a format specification for arguments %u and %u doesn't exist in '%s', only "
 "one argument may be ignored"
 msgstr ""
-"formateringsdirektiv för argument %u, som i \"%s\", finns inte i \"%s\""
+"formateringsdirektiv för argument %u och %u finns inte i �%s�, endast ett "
+"argument kan ignoreras"
 
 #: src/format-kde-kuit.c:244 src/format-kde-kuit.c:264
 #: src/format-kde-kuit.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "error while parsing: %s"
-msgstr "fel uppstod då \"%s\" lästes"
+msgstr "fel vid tolkning: %s"
 
 #: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365
 #: src/format-scheme.c:2377
@@ -850,8 +859,8 @@ msgstr "formateringsdirektiv i \"%s\" och \"%s\" är inte ekvivalenta"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "formateringsdirektiv i \"%s\" är inte en delmängd av de i \"%s\""
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formateringsdirektiv för argument \"%s\" finns inte i \"%s\""
@@ -870,30 +879,30 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "I direktiv nummer %u kan inte \"%c\" inleda ett fältnamn."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "I direktiv nummer %u kan inte \"%c\" inleda ett getattr-argument."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "I direktiv nummer %u kan inte \"%c\" inleda ett getitem-argument."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr ""
-"I direktiv nummer %u är ytterligare nästling inte tillåten i en "
+"I direktiv nummer %u är ytterligare nästning inte tillåten i en "
 "formatspecifikation."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "I direktiv nummer %u finns ett oavslutat formatdirektiv."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -901,33 +910,33 @@ msgstr ""
 "Strängen refererar till argument både via argumentnamn och via namnlösa "
 "argumentspecifikationer."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Strängen refererar till argumentet \"%s\" på inkompatibla sätt."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "formateringsdirektiv i \"%s\" tar en avbildning, de i \"%s\" tar en tupel"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "formateringsdirektiv i \"%s\" tar en tupel, de i \"%s\" tar en avbildning"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "formateringsdirektiv för argument \"%s\", som i \"%s\", finns inte i \"%s\""
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -952,8 +961,8 @@ msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"Strängen refererar till en skalvariabel med komplex krullparentessyntax.  "
-"Denna syntax stöds inte här av säkerhetsskäl."
+"Strängen refererar till en skalvariabel med komplex skalklammersyntax.  "
+"Denna syntax stödjs inte här av säkerhetsskäl."
 
 #: src/format-sh.c:84
 msgid ""
@@ -983,7 +992,7 @@ msgstr ""
 "Tecknet som avslutar direktiv nummer %u är inte en siffra mellan 1 och 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1030,11 +1039,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresser för värdnamnet\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativ utskrift:\n"
@@ -1045,60 +1054,60 @@ msgid "could not get host name"
 msgstr "kunde inte hämta värdnamn"
 
 #: src/its.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "selector is not specified"
-msgstr "minst två filer måste anges"
+msgstr "selektorn är inte angiven"
 
 #: src/its.c:326 src/its.c:1550
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create XPath context"
-msgstr "kan inte skapa rör"
+msgstr "kan inte skapa XPath-kontext"
 
 #: src/its.c:344
 #, c-format
 msgid "cannot evaluate XPath expression: %s"
-msgstr ""
+msgstr "kan inte evaluera XPath-uttryck: %s"
 
 #: src/its.c:614
 #, c-format
 msgid "\"%s\" node does not contain \"%s\""
-msgstr ""
+msgstr "�%s�-nod innehåller inte �%s�"
 
 #: src/its.c:1001
-#, fuzzy, c-format
+#, c-format
 msgid "invalid attribute value \"%s\" for \"%s\""
-msgstr "ogiltigt argument %s för %s"
+msgstr "ogiltigt attributvärde �%s� för �%s�"
 
 #: src/its.c:1333
 #, c-format
 msgid "the root element is not \"rules\" under namespace %s"
-msgstr ""
+msgstr "rotelementet är inte �rules� under namnrymden %s"
 
 #: src/its.c:1376 src/its.c:1402 src/its.c:1795 src/its.c:1914
 #: src/locating-rule.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read %s: %s"
-msgstr "kan inte skapa rör"
+msgstr "kan inte läsa %s: %s"
 
 #: src/its.c:1573
 #, c-format
 msgid "cannot evaluate XPath location path: %s"
-msgstr ""
+msgstr "kan inte evaluera XPath-platssökväg: %s"
 
 #: src/locating-rule.c:236
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" node does not have \"%s\""
-msgstr "%s finns inte"
+msgstr "�%s�-nod har inte �%s�"
 
 #: src/locating-rule.c:307
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read XML file %s"
-msgstr "kan inte skapa utfilen \"%s\""
+msgstr "kan inte läsa XML-filen %s"
 
 #: src/locating-rule.c:319
 #, c-format
 msgid "the root element is not \"locatingRules\""
-msgstr ""
+msgstr "rotelementet är inte �locatingRules�"
 
 #: src/msgattrib.c:377 src/msgconv.c:266 src/msgexec.c:155 src/msgfilter.c:197
 #: src/msggrep.c:441 src/msginit.c:198 src/msguniq.c:286
@@ -1106,12 +1115,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "högst en infil tillåten"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s och %s är ömsesidigt uteslutande"
@@ -1130,7 +1139,7 @@ msgstr ""
 "Filtrerar meddelanden i en meddelandekatalog efter deras attribut och\n"
 "manipulerar attributen.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1140,10 +1149,10 @@ msgid ""
 msgstr ""
 "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Plats för infiler:\n"
@@ -1153,10 +1162,10 @@ msgstr "Plats för infiler:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INFIL                       PO-infil\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1166,25 +1175,25 @@ msgstr "  -D, --directory=KATALOG     sök infiler även i KATALOG\n"
 #: src/msggrep.c:536 src/msgunfmt.c:454 src/msguniq.c:352
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Om ingen infil är given eller om den är - läses standard in.\n"
+msgstr "Om ingen infil är angiven eller om den är -, läses standard in.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Plats för utfil:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FIL       skriv resultat till angiven fil\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1194,7 +1203,7 @@ msgid ""
 msgstr ""
 "Resultatet skrivs till standard ut om ingen utfil anges eller om den är -.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Meddelandeval:\n"
@@ -1319,9 +1328,9 @@ msgid ""
 msgstr ""
 "      --obsolete              samma som --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1344,17 +1353,17 @@ msgstr ""
 "      --stringtable-input     infil har NeXTstep/GNUstep \".strings\"-"
 "syntax\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Resultatdetaljer:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1363,22 +1372,21 @@ msgid ""
 "'html'.\n"
 msgstr ""
 "      --color                 använd alltid färger och andra textattribut\n"
-"      --color=VILLKOR         använd färger och andra textattribut beroende "
+"      --color=NÄR             använd färger och andra textattribut beroende "
 "på\n"
-"                              VILLKOR, som kan vara \"always\", \"never\", "
-"\"auto\"\n"
-"                              eller \"html\".\n"
+"                              NÄR, som kan vara �always�, �never�, �auto�\n"
+"                              eller �html�.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr "      --style=STILMALL        ange CSS stillmallsfil för --color\n"
+msgstr "      --style=STILMALL        ange CSS stilmallsfil för --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1386,38 +1394,38 @@ msgstr ""
 "  -e, --no-escape             använd inte C-kontrollsekvenser i resultatet\n"
 "                                (normalläge)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                använd C-kontrollsekvenser i resultatet, men\n"
-"                              inte \\v eller \\a\n"
+"                                inga utökade tecken\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              skriv PO-fil även om den är tom\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                indentera resultatet\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           skriv inte rader med \"#: filnamn:rad\"\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1425,39 +1433,39 @@ msgstr ""
 "  -n, --add-location          skriv rader med \"#: filnamn:rad"
 "\" (normalläge)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     skriv en \"Java .properties\"-fil\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    skriv en NeXTstep/GNUstep \".strings\"-fil\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANTAL           välj antal kolumner i resultatet\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1466,31 +1474,31 @@ msgstr ""
 "      --no-wrap               dela inte meddelanden som är längre än\n"
 "                              resultatets kolumnantal i flera rader\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sortera resultatet\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sortera resultatet efter filposition\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "omöjligt urvalskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Användning: %s [FLAGGA] [INFIL]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1513,23 +1521,23 @@ msgstr ""
 "ihop,  utom om --use-first ges.  Då tas de endast från den första PO-filen som\n"
 "definierar dem.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INFIL ...                   infiler\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FIL        läs lista av infiler från FIL\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Om infil är - läses standard in.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1538,7 +1546,7 @@ msgstr ""
 "  -<, --less-than=ANTAL       skriv meddelanden med färre än ANTAL\n"
 "                              definitioner. Standardvärde: oändligt\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1547,7 +1555,7 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelanden med fler än ANTAL\n"
 "                              definitioner. Standardvärde: 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1556,7 +1564,7 @@ msgstr ""
 "  -u, --unique                samma som --less-than=2, begär att\n"
 "                              endast unika meddelanden skrivs\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1564,7 +1572,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      infiler har \"Java .properties\"-syntax\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1574,12 +1582,12 @@ msgstr ""
 "      --stringtable-input     infiler har NeXTstep/GNUstep \".strings\"-"
 "syntax\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAMN          kodning för resultatet\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1588,14 +1596,14 @@ msgstr ""
 "      --use-first             använd först hittade översättning för varje\n"
 "                              meddelande, slå inte ihop översättningar\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=KATALOGNAMN      sätt \"Language\"-fältet i huvudet\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1700,19 +1708,19 @@ msgstr "detta meddelande används men är inte definierat i %s"
 msgid "warning: this message is not used"
 msgstr "varning: detta meddelande används inte"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d allvarligt fel hittat"
 msgstr[1] "%d allvarliga fel hittades"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "minst två filer måste anges"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1733,7 +1741,7 @@ msgstr ""
 "endast från den första PO-filen som definierar dem. Filpositioner från\n"
 "alla filer bevaras.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1742,7 +1750,7 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelanden med fler än ANTAL\n"
 "                              definitioner. Standardvärde: 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1790,7 +1798,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "inga infiler givna"
@@ -1858,14 +1866,15 @@ msgstr ""
 "\"xargs -O\"\n"
 
 #: src/msgexec.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "Command input:\n"
-msgstr "standard in"
+msgstr "Kommandoindata:\n"
 
 #: src/msgexec.c:285
-#, fuzzy, c-format
+#, c-format
 msgid "  --newline                   add newline at the end of input\n"
-msgstr "  -h, --help                  visa denna hjälptext och avsluta\n"
+msgstr ""
+"  --newline                   lägg till en nyrad vid slutet av indata\n"
 
 #: src/msgexec.c:293 src/msgfilter.c:427
 #, c-format
@@ -1909,7 +1918,7 @@ msgstr ""
 #: src/msgfilter.c:447
 #, c-format
 msgid "Filter input and output:\n"
-msgstr ""
+msgstr "Filterindata och -utdata:\n"
 
 #: src/msgfilter.c:449
 #, c-format
@@ -1917,6 +1926,8 @@ msgid ""
 "  --newline                   add a newline at the end of input and\n"
 "                                remove a newline from the end of output"
 msgstr ""
+"  --newline                   lägg till en nyrad till slutet av indata och\n"
+"                                ta bort en nyrad från slutet av utdata"
 
 #: src/msgfilter.c:453
 #, c-format
@@ -1971,122 +1982,123 @@ msgstr ""
 "inte\n"
 
 #: src/msgfilter.c:666
-#, fuzzy, c-format
+#, c-format
 msgid "filter output is not terminated with a newline"
-msgstr "filen \"%s\" innehåller en sträng som inte avslutas med nolltecknet"
+msgstr "filterutdata avslutas inte med en nyrad"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentet till %s ska vara ett enskilt skiljetecken"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ogiltig byteordning: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "ingen infil ska anges om %s och %s är givna"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s kräver att \"-d katalog\" anges"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s kräver att \"-l lokal\" anges"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s kräver att \"--template mall\" anges"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s kräver att \"-o fil\" anges"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s och %s är ömsesidigt uteslutande i %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s är endast giltig med %s eller %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s är endast giltig med %s, %s eller %s"
 
-#: src/msgfmt.c:723
-#, fuzzy, c-format
+#: src/msgfmt.c:713
+#, c-format
 msgid "cannot locate ITS rules for %s"
-msgstr "kan inte skapa utfilen \"%s\""
+msgstr "kan inte hitta ITS-regler för %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d översatt meddelande"
 msgstr[1] "%d översatta meddelanden"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d luddig översättning"
 msgstr[1] ", %d luddiga översättningar"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d oöversatt meddelande"
 msgstr[1] ", %d oöversatta meddelanden"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Användning: %s [FLAGGA] filnamn.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
-"Generera en binär meddelandekatalog från en textuell meddelandekatalog.\n"
+"Generera en binär meddelandekatalog från en textuell beskrivning av "
+"översättning.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filnamn.po ...              infiler\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Körläge:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2095,7 +2107,7 @@ msgstr ""
 "  -j, --java                  Javaläge: generera en Java ResourceBundle-"
 "klass\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2104,12 +2116,12 @@ msgstr ""
 "      --java2                 som --java, och anta Java2 (JDK 1.2 eller "
 "högre)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C#-läge: generera en .NET .dll-fil\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2118,7 +2130,7 @@ msgstr ""
 "      --csharp-resources      C#-resursläge: generera en .NET .resources-"
 "fil\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2126,12 +2138,12 @@ msgstr ""
 "      --tcl                   Tcl-läge: generera en .msg-fil av tcl/msgcat-"
 "typ\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt-läge: generera en Qt .qm-fil\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2139,33 +2151,33 @@ msgstr ""
 "      --desktop               \"Desktop Entry\"-läge: generera en .desktop-"
 "fil\n"
 
-#: src/msgfmt.c:957
-#, fuzzy, c-format
+#: src/msgfmt.c:947
+#, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
-msgstr "      --qt                    Qt-läge: generera en Qt .qm-fil\n"
+msgstr "      --xml                   XML-läge: generera en XML-fil\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "Om UTFIL är - skrivs resultatet till standard ut.\n"
+msgstr "Om utfilen är - skrivs resultatet till standard ut.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Plats för utfil i Javaläge:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURS       resursnamn\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2173,7 +2185,7 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOKAL          lokalnamn, antingen språk eller språk_LAND\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2182,13 +2194,13 @@ msgstr ""
 "      --source                generera en .java-fil istället för en .class-"
 "fil\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d KATALOG                  startkatalog för klassers katalogträd\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2200,12 +2212,12 @@ msgstr ""
 "avskiljt med ett understreck.  Flaggan -d är obligatorisk.  Klassen skrivs\n"
 "till den givna katalogen.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Plats för utfil i C#-läge:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2213,7 +2225,7 @@ msgid ""
 msgstr ""
 "  -d KATALOG                  startkatalog för lokalberoende .dll-filer\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2221,20 +2233,20 @@ msgid ""
 msgstr ""
 "Flaggorna -l och -d är obligatoriska.  .dll-filen skrivs till en "
 "underkatalog\n"
-"till den givna katalogen.  Underkatalogens namn beror på lokalen.\n"
+"till den angivna katalogen vars namn beror på lokalen.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Plats för utfil i Tcl-läge:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d KATALOG                  startkatalog för .msg-meddelandekataloger\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2243,31 +2255,31 @@ msgstr ""
 "Flaggorna -l och -d är obligatoriska.  .msg-filen skrivs till den givna\n"
 "katalogen.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Flaggor för \"Desktop Entry\"-läge\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=MALL             en .desktop-fil att använda som mall\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d KATALOG                  baskatalog för .po-filer\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"  -kORD, --keyword[=ORD]      sök efter ORD som ett extra nyckelord\n"
+"  -kORD, --keyword=ORD        sök efter ORD som ett extra nyckelord\n"
 "  -k, --keyword               använd inte standardnyckelord\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2277,27 +2289,27 @@ msgstr ""
 "Flaggorna -l, -o och --template är obligatoriska.  Om -D är given så läses\n"
 "indatafiler från katalogen och inte från kommandoradsargument.\n"
 
-#: src/msgfmt.c:1024
-#, fuzzy, c-format
+#: src/msgfmt.c:1014
+#, c-format
 msgid "XML mode options:\n"
-msgstr "Flaggor för \"Desktop Entry\"-läge\n"
+msgstr "XML-lägesflaggor:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
-msgstr ""
+msgstr "  -L, --language=NAMN         känn igen det angivna XML-språket\n"
 
-#: src/msgfmt.c:1032
-#, fuzzy, c-format
+#: src/msgfmt.c:1022
+#, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
-msgstr "  --template=MALL             en .desktop-fil att använda som mall\n"
+msgstr "  --template=MALL             en XML-fil använd som en mall\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Tolkning av infil:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2308,13 +2320,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          kontrollera språkberoende formatsträngar\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2322,7 +2334,7 @@ msgid ""
 msgstr ""
 "      --check-header          verifiera närvaro och innehåll av huvudrader\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2331,7 +2343,7 @@ msgstr ""
 "      --check-domain          kontrollera konflikter mellan domändirektiv\n"
 "                                och flaggan --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2340,7 +2352,7 @@ msgstr ""
 "  -C, --check-compatibility   kontrollera att GNU msgfmt uppför sig som\n"
 "                                X/Open msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2351,19 +2363,19 @@ msgstr ""
 "tangentkortkommandon\n"
 "                                för menyer\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             använd luddiga poster i resultatet\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=TAL         lägg strängar på jämna TAL byte (normalt: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2375,91 +2387,91 @@ msgstr ""
 "                                (big eller little, standard beror på "
 "plattform)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               binärfil innehåller inte hashtabellen\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            skriv ut statistik om översättningarna\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               öka mängden information i meddelanden\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "varning: konvertering till användarens teckenuppsättning kommer att "
 "misslyckas.\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "varning: PO-filens huvudrader är luddiga\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "varning: äldre versioner av msgfmt ger ett fel för detta\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domännamnet \"%s\" är inte lämpligt som filnamn"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domännamnet \"%s\" är inte lämpligt som filnamn: använder ett prefix"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direktivet \"domain %s\" ignoreras"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "tom \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "luddig \"msgstr\"-rad ignorerad"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varning: källfilen innehåller luddiga översättningar"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s finns inte"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s finns men kan inte läsas"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fel uppstod då \"%s\" lästes"
@@ -2527,13 +2539,13 @@ msgstr ""
 "  [-C KOMMENTARSMÖNSTER] [-X EXTRAHERAD-KOMMENTARSMÖNSTER]\n"
 "Ett meddelande väljs om det kommer från en av de angivna källkodsfilerna,\n"
 "eller om det kommer från en av de angivna domänerna,\n"
-"eller om -J ges och kontextet (msgctxt) matchar MSGCTXT-MÖNSTER,\n"
+"eller om -J ges och kontexten (msgctxt) matchar MSGCTXT-MÖNSTER,\n"
 "eller om -K ges och nyckeln (msgid eller msgid_plural) matchar MSGID-MÖNSTER,\n"
 "eller om -T ges och översättningen (msgstr) matchar MSGSTR-MÖNSTER,\n"
 "eller om -C ges och översättarens kommentar matchar KOMMENTARSMÖNSTER\n"
 "eller om -X ges och den extraherade kommentaren matchar EXTRAHERAD-KOMMENTARSMÖNSTER.\n"
 "\n"
-"När fler än ett utvalskriteria anges är mängden valda meddelanden unionen\n"
+"När fler än ett urvalskriteria anges är mängden valda meddelanden unionen\n"
 "av utvalda meddelanden för varje enskilt kriterium.\n"
 "\n"
 "Syntax för MSGCTXT-MÖNSTER, MSGID-MÖNSTER, MSGSTR-MÖNSTER, KOMMENTARSMÖNSTER\n"
@@ -2700,12 +2712,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Svenska översättningar för paket %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "nuvarande teckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "två olika teckenuppsättningar \"%s\" och \"%s\" i infilen"
@@ -2724,14 +2736,14 @@ msgid ""
 msgstr ""
 "domän \"%s\" i infil \"%s\" saknar en huvudrad som anger teckenuppsättning"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "målteckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "varning: "
@@ -2767,7 +2779,7 @@ msgid ""
 msgstr ""
 "Konvertering av filen %s från teckenkodning %s till teckenkodning %s ändrar\n"
 "några msgid:s eller msgctxt:s.\n"
-"Antingen ändrar du alla msgid:s och msgctxt:s till att bara inehålla ASCII\n"
+"Antingen ändrar du alla msgid:s och msgctxt:s till att bara innehålla ASCII\n"
 "eller se till att de är UTF-8-kodade från början, d.v.s. redan i dina\n"
 "källkodsfiler.\n"
 
@@ -2824,74 +2836,74 @@ msgstr ""
 "Resultatet för \"%s\" kan bli felaktigt.\n"
 "Ett möjligt sätt att komma runt problemet är att sätta LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "pluraluttryck kan producera negativa värden"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu men pluraluttryck kan ge värden upp till %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "pluraluttryck kan ge division med noll"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "pluraluttryck kan ge heltalsspill"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "pluraluttryck kan ge aritmetiska fel, möjligen division med noll"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Försök använda den här, gäller för \"%s\":"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "meddelandekatalog har översättningar med pluralform"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "men huvudrader saknar attribut av typ \"plurals=UTTRYCK\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "men huvudrader saknar ett attribut av typ \"nplurals=HELTAL\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "ogiltigt värde för nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "ogiltigt pluraluttryck"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "men några meddelanden har bara en pluralform"
 msgstr[1] "men några meddelanden har bara %lu pluralformer"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "men några meddelanden har en pluralform"
 msgstr[1] "men några meddelanden har %lu pluralformer"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2899,90 +2911,95 @@ msgstr ""
 "meddelandekatalog har översättningar med pluralformer, men saknar huvudrad "
 "med \"Plural-Forms: nplurals=HELTAL; plural=UTTRYCK;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "\"msgid\"- och \"msgid_plural\"-raderna börjar inte båda med \"\\n\""
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "\"msgid\"- och \"msgstr[%u]\"-raderna börjar inte båda med \"\\n\""
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "\"msgid\"- och \"msgstr\"-raderna börjar inte båda med \"\\n\""
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgid_plural\"-raderna slutar inte båda med \"\\n\""
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgstr[%u]\"-raderna slutar inte båda med \"\\n\""
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "\"msgid\"- och \"msgstr\"-raderna slutar inte båda med \"\\n\""
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "hantering av plural är en utökning i GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr saknar märket \"%c\" för tangentkortkommandon"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har för många märken \"%c\" för tangentkortkommandon"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "huvudrad \"%s\" har kvar initialt standardvärde\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "huvudrad \"%s\" saknas i huvudet\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
-msgstr ""
+msgstr "ASCII-ellips (�...�) istället för Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
-msgstr ""
+msgstr "mellanrum före ellips i användarsynliga strängar"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
-msgstr ""
+msgstr "ASCII dubbelt citationstecken använt istället för Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
-msgstr ""
+msgstr "ASCII enkelt citationstecken använt istället för Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII-punkt (�%c�) istället för Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: indata är inte giltig i teckenkodningen \"%s\""
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: fel uppstod vid konvertering från teckenuppsättning \"%s\" till "
 "teckenuppsättning \"%s\""
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "infilen saknar en huvudrad som anger teckenuppsättning"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2991,7 +3008,7 @@ msgstr ""
 "Kan inte konvertera från \"%s\" till \"%s\".  %s beror på iconv()\n"
 "och iconv() stöder inte denna konvertering."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3000,8 +3017,8 @@ msgstr ""
 "Konvertering från \"%s\" till \"%s\" ger duplikat: några msgid som skiljer "
 "sig blir lika."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3436,7 +3453,7 @@ msgstr "radslut inne i en sträng"
 msgid "context separator <EOT> within string"
 msgstr "kontextseparator <EOT> inne i sträng"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denna fil kan inte innehålla domändirektiv"
@@ -3451,39 +3468,37 @@ msgstr "detta är platsen för den första definitionen"
 
 #: src/read-desktop.c:267
 msgid "unterminated group name"
-msgstr ""
+msgstr "oavslutat gruppnamn"
 
 #: src/read-desktop.c:286
-#, fuzzy
 msgid "invalid non-blank character"
-msgstr "varning: ogiltigt Unicodetecken"
+msgstr "ogiltigt icke-blankt tecken"
 
-#: src/read-desktop.c:403
-#, fuzzy, c-format
+#: src/read-desktop.c:405
+#, c-format
 msgid "missing '=' after \"%s\""
-msgstr "filternamn saknas"
+msgstr "�=� saknas efter �%s�"
 
-#: src/read-desktop.c:466
-#, fuzzy
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
-msgstr "ogiltigt värde för nplurals"
+msgstr "ogiltig icke-tom rad"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "filen \"%s\" är avkortad"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "filen \"%s\" innehåller en sträng som inte avslutas med nolltecknet"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "filen \"%s\" är inte på GNUs .mo-format"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
@@ -3667,24 +3682,24 @@ msgstr "kompilering av C#-klass misslyckades, försök med --verbose"
 msgid "compilation of C# class failed"
 msgstr "kompilering av C#-klass misslyckades"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "fel uppstod när \"%s\" öppnades för skrivning"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "inte ett giltigt Javaklassnamn: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "kompilering av Javaklass misslyckades, försök med --verbose eller sätt $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilering av Javaklass misslyckades, försök sätta $JAVAC"
@@ -3792,12 +3807,12 @@ msgstr ""
 "meddelandekatalog har översättningar med pluralformer men formatet för\n"
 "Tcl-meddelandekataloger stöder inte pluralhantering\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: varning: oavslutad sträng"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: varning: oavslutat reguljärt uttryck"
@@ -3817,7 +3832,7 @@ msgstr "%s:%d: varning: oavslutad teckenkonstant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: varning: oavslutad sträng"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Ange källkodning med --from-code."
 
@@ -3838,7 +3853,6 @@ msgid ""
 msgstr ""
 "%s:%d: Lång ofullständig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code.\n"
-"\n"
 
 #: src/x-csharp.c:298
 #, c-format
@@ -3848,7 +3862,6 @@ msgid ""
 msgstr ""
 "%s:%d: Ofullständig multibytesekvens vid filslut.\n"
 "Ange korrekt källkodning med --from-code.\n"
-"\n"
 
 #: src/x-csharp.c:307
 #, c-format
@@ -3859,7 +3872,7 @@ msgstr ""
 "%s:%d: Ofullständig multibytesekvens vid radslut.\n"
 "Ange korrekt källkodning med --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv misslyckades"
@@ -3872,9 +3885,8 @@ msgid ""
 msgstr ""
 "%s:%d: Ogiltig multibytesekvens.\n"
 "Ange korrekt källkodning med --from-code.\n"
-"\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: varning: ogiltigt Unicodetecken"
@@ -3894,55 +3906,56 @@ msgstr "%s:%d: varning: \")\" hittades där \"}\" förväntades"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: varning: \"}\" hittades där \")\" förväntades"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 "%s är inte ett giltigt kodningsnamn.  Använder ASCII som reservalternativ\n"
 
-#: src/xgettext.c:648
-#, fuzzy, c-format
+#: src/xgettext.c:651
+#, c-format
 msgid "syntax check '%s' unknown"
-msgstr "språket \"%s\" okänt"
+msgstr "syntaxkontrollen �%s� okänd"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
-msgstr ""
+msgstr "meningens sluttyp �%s� okänd"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan inte användas då resultatet skrivs till standard ut"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext måste ha nyckelord att söka efter för att fungera"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
-msgstr ""
+msgstr "varning: ITS-regelfilen �%s� finns inte"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
+"varning: ITS-regelfilen �%s� finns inte; kontrollera din gettext-installation"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "varning: filtyp \"%s\" med suffix \"%s\" är okänd; försöker med C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extrahera översättbara strängar från givna infiler.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3951,23 +3964,23 @@ msgstr ""
 "  -d, --default-domain=NAMN  använd NAMN.po som utfil (i st.f. messages."
 "po) \n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FIL            skriv resultatet till FIL\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=KATALOG    utfiler placeras i katalogen KATALOG\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Språkval i infiler:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3988,19 +4001,19 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   samma som --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "I normalläge gissas språket från filändelsen på infilen.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4009,23 +4022,23 @@ msgstr ""
 "      --from-code=NAMN        kodning av infiler\n"
 "                                (utom för Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Normalt antas att filer är i ASCII-format.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         slå ihop meddelanden med existerande fil\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FIL.po   rader från FIL tas inte ut\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4041,33 +4054,39 @@ msgstr ""
 "nyckelordsrader\n"
 "                                 till resultatet\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
+"      --check=NAMN            utför syntaxkontroll av meddelanden\n"
+"                                (ellipsis-unicode, space-ellipsis,\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
 "                                (single-space, which is the default, \n"
 "                                 or double-space)\n"
 msgstr ""
+"      --sentence-end=TYP      typen beskriver slut på meningar\n"
+"                                (single-space, som är standard, \n"
+"                                 eller double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Språkspecifika val:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrahera alla strängar\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4082,7 +4101,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4097,7 +4116,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4107,7 +4126,7 @@ msgstr ""
 "      --flag=ORD:NR:FLAGGA    extra FLAGGA för strängar inne i argument\n"
 "                              nummer NR för nyckelord ORD\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4122,83 +4141,88 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             hantera ANSI C treteckenssekvenser i infiler\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (bara språken C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=FIL               tillämpa ITS-regler från FIL\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (bara XML-baserade språk)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    känn igen Qt-formatsträngar\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (bara språket C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   känn igen KDE 4 formatsträngar\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 känn igen Boost-formatsträngar\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 mer detaljerad igenkänning av formatsträngar\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     skriv en \"Java .properties\"-fil\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "  -f, --files-from=FIL        läs lista av infiler från FIL\n"
-
-#: src/xgettext.c:1198
-#, fuzzy, c-format
+#: src/xgettext.c:1188
+#, c-format
 msgid "      --itstool               write out itstool comments\n"
-msgstr "      --indent                indentera resultatet\n"
+msgstr "      --itstool               skriv ut itstool-kommentarer\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=STRÄNG  sätt copyrightinnehavare i resultatet\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          utelämna FSF copyrighttext i resultatet\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    sätt paketnamn i utdata\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  sätt paketversion i utdata\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4206,7 +4230,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOST@ADRESS   sätt mottagare för msgid-"
 "felrapporter\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4216,7 +4240,7 @@ msgstr ""
 "  -m[STRÄNG], --msgstr-prefix[=STRÄNG]  inled översatta strängar med STRÄNG "
 "eller \"\"\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4226,7 +4250,7 @@ msgstr ""
 "  -M[STRÄNG], --msgstr-suffix[=STRÄNG]  avsluta översatta strängar med "
 "STRÄNG eller \"\"\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4234,31 +4258,31 @@ msgid ""
 msgstr ""
 "Ett \"--flag\"-argument har inte <ord>:<nummer>:[pass-]<flagga> syntax: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standard in"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Icke-ASCII-tecken vid %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Icke-ASCII-kommentar vid eller före %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Icke-ASCII-sträng vid %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: varning: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4267,7 +4291,7 @@ msgstr ""
 "%s är inte en giltig formatsträng för %s trots att den används i en "
 "formatsträngsposition. Orsak: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4276,7 +4300,7 @@ msgstr ""
 "%s är inte en giltig formatsträng för %s trots att den är deklarerad som en. "
 "Orsak: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4290,7 +4314,7 @@ msgstr ""
 "Överväg att istället använda en formatsträng med namngivna argument\n"
 "och en mappning istället för en lista för argumenten.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4300,27 +4324,27 @@ msgstr ""
 "gettext(\"\") returnerar huvudet med metainformation,\n"
 "inte den tomma strängen.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "tvetydig argumentspecifikation för nyckelord \"%.*s\""
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "varning: kontext saknas för nyckelordet \"%.*s\""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "varning: kontext saknas för pluralargumentet till nyckelordet \"%.*s\""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontext misstämmer mellan singular- och pluralformen"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4332,7 +4356,7 @@ msgstr ""
 "på variabeln MSGID_BUGS_ADDRESS där, annars ange\n"
 "flaggan --msgid-bugs-address på kommandoraden.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "språket \"%s\" okänt"
@@ -4441,7 +4465,7 @@ msgstr "%s:%d: ogiltig sekvens (\"\\L\") för åttabitarstecknet \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ogiltig sekvens (\"\\U\") för åttabitarstecknet \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4449,7 +4473,7 @@ msgstr ""
 "Ange källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4460,7 +4484,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4471,7 +4495,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4482,7 +4506,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4493,7 +4517,7 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4504,22 +4528,22 @@ msgstr ""
 "Ange korrekt källkodning med --from-code eller med en kommentar enligt\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Okänd kodning \"%s\". Fortsätter med ASCII istället."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ogiltig strängdefinition"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d fattas tal efter #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ogiltigt strängmönster"
@@ -4543,138 +4567,123 @@ msgid "<unnamed>"
 msgstr "<utan namn>"
 
 #: libgettextpo/markup.c:366 libgettextpo/markup.c:449
-#, fuzzy
 msgid "invalid UTF-8 sequence"
-msgstr "ogiltig kontrollsekvens"
+msgstr "ogiltig UTF-8-sekvens"
 
 #: libgettextpo/markup.c:377
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid name: %c"
-msgstr "inte ett giltigt Javaklassnamn: %s"
+msgstr "�%s� är inte ett giltigt namn: %c"
 
 #: libgettextpo/markup.c:397
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid name: '%c'"
-msgstr "inte ett giltigt Javaklassnamn: %s"
+msgstr "�%s� är inte ett giltigt namn: �%c�"
 
 #: libgettextpo/markup.c:523 libgettextpo/markup.c:534
 #: libgettextpo/markup.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "invalid character reference: %s"
-msgstr "ogiltig kontrollsekvens"
+msgstr "ogiltig teckenreferens: %s"
 
 #: libgettextpo/markup.c:526
 msgid "not a valid number specification"
-msgstr ""
+msgstr "inte en giltig talspecifikation"
 
 #: libgettextpo/markup.c:535 libgettextpo/markup.c:606
 msgid "no ending ';'"
-msgstr ""
+msgstr "inget avslutande �;�"
 
 #: libgettextpo/markup.c:560
 msgid "non-permitted character"
-msgstr ""
+msgstr "otillåtet tecken"
 
 #: libgettextpo/markup.c:599
 msgid "empty"
-msgstr ""
+msgstr "tomt"
 
 #: libgettextpo/markup.c:604
 msgid "unknown"
-msgstr ""
+msgstr "okänt"
 
 #: libgettextpo/markup.c:608
-#, fuzzy, c-format
+#, c-format
 msgid "invalid entity reference: %s"
-msgstr "ogiltig byteordning: %s"
+msgstr "ogiltig enhetsreferens: %s"
 
 #: libgettextpo/markup.c:959
 msgid "document must begin with an element"
-msgstr ""
+msgstr "dokumentet måste börja med ett element"
 
 #: libgettextpo/markup.c:994 libgettextpo/markup.c:1301
 #: libgettextpo/markup.c:1332
-#, fuzzy, c-format
+#, c-format
 msgid "invalid character after '%s'"
-msgstr "ogiltigt argument %s för %s"
+msgstr "felaktigt tecken efter �%s�"
 
 #: libgettextpo/markup.c:1031 libgettextpo/markup.c:1107
 #, c-format
 msgid "missing '%c'"
-msgstr ""
+msgstr "�%c� saknas"
 
 #: libgettextpo/markup.c:1140 libgettextpo/markup.c:1176
 #, c-format
 msgid "missing '%c' or '%c'"
-msgstr ""
+msgstr "�%c� eller �%c� saknas"
 
 #: libgettextpo/markup.c:1333
 msgid "a close element name"
-msgstr ""
+msgstr "ett avslutande elementnamn"
 
 #: libgettextpo/markup.c:1339 libgettextpo/markup.c:1344
 msgid "element is closed"
-msgstr ""
+msgstr "elementet är avslutat"
 
 #: libgettextpo/markup.c:1475
 msgid "empty document"
-msgstr ""
+msgstr "tomt dokument"
 
 #: libgettextpo/markup.c:1488
 msgid "after '<'"
-msgstr ""
+msgstr "efter �<�"
 
 #: libgettextpo/markup.c:1495 libgettextpo/markup.c:1527
 msgid "elements still open"
-msgstr ""
+msgstr "element är fortfarande öppna"
 
 #: libgettextpo/markup.c:1500
 msgid "missing '>'"
-msgstr ""
+msgstr "�>� saknas"
 
 #: libgettextpo/markup.c:1504
 msgid "inside an element name"
-msgstr ""
+msgstr "inuti ett elementnamn"
 
 #: libgettextpo/markup.c:1509
-#, fuzzy
 msgid "inside an attribute name"
-msgstr "filternamn saknas"
+msgstr "inuti ett attributnamn"
 
 #: libgettextpo/markup.c:1513
 msgid "inside an open tag"
-msgstr ""
+msgstr "inuti en öppningstagg"
 
 #: libgettextpo/markup.c:1517
 msgid "after '='"
-msgstr ""
+msgstr "efter �=�"
 
 #: libgettextpo/markup.c:1522
 msgid "inside an attribute value"
-msgstr ""
+msgstr "inuti ett attributvärde"
 
 #: libgettextpo/markup.c:1533
 msgid "inside the close tag"
-msgstr ""
+msgstr "inuti stängningstaggen"
 
 #: libgettextpo/markup.c:1537
 msgid "inside a comment or processing instruction"
-msgstr ""
+msgstr "inuti en kommentar eller bearbetningsinstruktion"
 
 #: libgettextpo/markup.c:1548
 #, c-format
 msgid "document ended unexpectedly: %s"
-msgstr ""
-
-#~ msgid "Missing context for the string extracted from '%s' element"
-#~ msgstr "Kontext saknas för strängen extraherad från element \"%s\""
-
-#~ msgid "%s:%lu:%lu: %s"
-#~ msgstr "%s:%lu:%lu: %s"
-
-#~ msgid ""
-#~ "Language \"glade\" is not supported. %s relies on expat.\n"
-#~ "This version was built without expat.\n"
-#~ msgstr ""
-#~ "Språk \"glade\" stöds ej. %s beror på expat.\n"
-#~ "Denna version byggdes utan expat.\n"
+msgstr "dokumentet avslutades oväntat: %s"
diff --git a/gettext-tools/po/tr.gmo b/gettext-tools/po/tr.gmo
index 5c24989..113cc4e 100644
--- a/gettext-tools/po/tr.gmo
+++ b/gettext-tools/po/tr.gmo
diff --git a/gettext-tools/po/tr.po b/gettext-tools/po/tr.po
index 0e0c080..c568e4a 100644
--- a/gettext-tools/po/tr.po
+++ b/gettext-tools/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2007-07-09 09:21+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -108,7 +108,7 @@ msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -186,15 +186,15 @@ msgstr "compile_java_class'ın source_version argümanı geçersiz"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class'ın target_version argümanı geçersiz"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" oluşturulamadı"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -220,39 +220,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s alt süreci G/Ç hatası"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s alt sürecine yazılamadı"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "%s alt sürecinden okunamadı"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "%s alt sürecine bloklanmayan G/Ç belirtilemez"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "%s alt süreci ile haberleşilemedi"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı"
@@ -291,18 +291,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "veriyolu oluşturulamıyor"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle başarısız oldu"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
@@ -334,11 +334,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
@@ -358,7 +358,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -373,21 +373,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  bu yardım iletisini gösterir ve çıkar\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  bu yardım iletisini gösterir ve çıkar\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               Sürüm bilgilerini gösterir ve çıkar\n"
@@ -397,22 +397,22 @@ msgstr "  -V, --version               Sürüm bilgilerini gösterir ve çıkar\n
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine,\n"
 "Çeviri hatalarını <gnu-tr@belgeler.org> adresine bildiriniz.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -422,10 +422,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "%s tarafından yazıldı.\n"
@@ -456,18 +456,18 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" okunmak için açılırken hata"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -475,19 +475,19 @@ msgstr ""
 "'%2$s' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "%u. argüman için '%s' içinde bir biçem belirteci yok"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -527,8 +527,7 @@ msgstr ""
 "Dizge %u numaralı argümana karşılık değil, %u numaralı argüman yok sayılıyor."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda"
@@ -849,8 +848,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "'%s' içindeki biçem belirteçleri 'msgid' içindekilerin bir alt kümesi değil"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "'%s' için '%s' içinde bir biçem belirteci yok"
@@ -869,29 +868,29 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "%u numaralı yönergede, '%c' den sonra bir rakam gelmiyor."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "%u numaralı yönergede, '{' ayracından sonra bir argüman numarası gelmiyor."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "%u numaralı yönergede, '%c' den sonra bir rakam gelmiyor."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "%u numaralı yönergede, '%c' den önce bir hassasiyet olmamalı."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, fuzzy, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "%u numaralı yönergede, %d. argüman negatif."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -899,12 +898,12 @@ msgstr ""
 "Dizge hem argüman isimlerine hem de numarasız argüman belirtimlerine "
 "karşılık geliyor."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Dizge '%s' isimli argümana uyumsuz bir yolla karşılık getirilmiş."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -912,7 +911,7 @@ msgstr ""
 "`msgid' içindeki biçem belirteçleri ile bir eşlem umulurken '%s' "
 "içindekilerle bir işlem umuluyor"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -920,13 +919,13 @@ msgstr ""
 "`msgid' içindeki biçem belirteçleri ile bir işlem umulurken '%s' "
 "içindekilerle bir eşlem umuluyor"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "'%2$s' içinde '%1$s' için 'msgid' içinde bir biçem belirteci yok"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -980,7 +979,7 @@ msgstr ""
 "%u numaralı yönergeyi sonlandıran karakter 1 ile 9 arasında bir rakam değil."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1027,11 +1026,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            konak adresleri\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Bilgilendirme çıktısı:\n"
@@ -1103,12 +1102,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "en fazla bir girdi dosyasına izin var"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ile %s bağdaşmıyor"
@@ -1127,7 +1126,7 @@ msgstr ""
 "Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n"
 "ve özellikleri uygular.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1137,10 +1136,10 @@ msgid ""
 msgstr ""
 "Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler için de zorunludur.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Girdi dosyasının yeri:\n"
@@ -1150,10 +1149,10 @@ msgstr "Girdi dosyasının yeri:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  GİRDİDOSYASI                girdi olan PO dosyası\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1167,23 +1166,23 @@ msgstr ""
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "Bir DOSYA verilmemiÅŸse ya da - verilmiÅŸse standart girdi okunur.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Çıktı dosyasının yeri:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=DOSYA     çıktıyı DOSYAya yazar\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1193,7 +1192,7 @@ msgid ""
 msgstr ""
 "Sonuçlar DOSYA verilmezse ya da - verilirse standart çıktıya yazılır.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "İleti seçimi:\n"
@@ -1311,9 +1310,9 @@ msgid ""
 msgstr ""
 "      --obsolete             --only-obsolete --clear-obsolete ile eşanlamlı\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1338,17 +1337,17 @@ msgstr ""
 "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi "
 "dosyası\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Çıktı ayrıntıları:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1357,16 +1356,16 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1374,9 +1373,9 @@ msgstr ""
 "  -e, --no-escape             çıktıda C öncelemeleri kullanılmaz "
 "(öntanımlı)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1385,28 +1384,28 @@ msgstr ""
 "karakterler\n"
 "                              yorumlanmaz\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              boş bile olsa PO dosyasını yazar\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                .po dosyasını girintili tarzda yazar\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: dosyaismi:satır' satırları yazılmaz\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1414,15 +1413,15 @@ msgstr ""
 "  -n, --add-location          '#: dosyaismi:satır' satırları üretilir\n"
 "                              (öntanımlı\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                .po dosyasının bilinen biçeminde yazar.\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
@@ -1430,9 +1429,9 @@ msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output     çıktıyı bir Java .properties dosyasına yazar\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1440,16 +1439,16 @@ msgstr ""
 "      --stringtable-output    çıktıyı bir NeXTstep/GNUstep .strings\n"
 "                              dosyasına yazar\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=SAYI            sayfa geniÅŸliÄŸini SAYIya ayarlar\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1458,31 +1457,31 @@ msgstr ""
 "      --no-wrap               sayfa genişliğine sığmayan satırların taşan\n"
 "                              kısmı bir alt satıra indirilmez\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sıralı çıktı üretir\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          çıktıyı dosyadaki yerine göre sıralar\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "belirtilen seçim kriteri mümkün değil (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1506,24 +1505,24 @@ msgstr ""
 "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n"
 "alınır.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  GİRDİDOSYASI ...            girdi dosyaları\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=DOSYA      girdi dosyalarının listesi DOSYAdan alınır\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Girdi dosyası - ise, standart girdi okunur.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1532,7 +1531,7 @@ msgstr ""
 "  -<, --less-than=SAYI        bu SAYIdan daha fazla olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı sonsuzdur.\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1541,7 +1540,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      bu SAYIdan daha az olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı 0 dır.\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1550,7 +1549,7 @@ msgstr ""
 "  -u, --unique                --less-than=2 için kısaltmadır, sadece\n"
 "                              eşi olmayan iletiler basılır\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1559,7 +1558,7 @@ msgstr ""
 "  -P, --properties-input      girdi dosyaları Java .properties "
 "sözdizimlidir\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1569,12 +1568,12 @@ msgstr ""
 "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi\n"
 "                              dosyaları\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=İSİM          çıktı için kodlama\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1583,14 +1582,14 @@ msgstr ""
 "      --use-first             her ileti için mevcut olan ilk kullanılır,\n"
 "                              çok sayıda çeviri varsa bile alınmaz.\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1694,19 +1693,19 @@ msgstr "bu ileti kullanıldı ama %s'de tanımlı değil"
 msgid "warning: this message is not used"
 msgstr "uyarı: bu ileti kullanılmamış"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d ölümcül hata bulundu"
 msgstr[1] "%d ölümcül hata bulundu"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "en az iki dosya belirtilmelidir"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1728,7 +1727,7 @@ msgstr ""
 "çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları\n"
 "korunmuş olacaktır.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1737,7 +1736,7 @@ msgstr ""
 "  ->, --more-than=SAYI        SAYIdan daha fazla olan iletileri basar,\n"
 "                              verilmezse öntanımlı 1 dir\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1786,7 +1785,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                çıktı bilinen biçemde yazılır\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "hiç girdi dosyası verilmemiş"
@@ -1966,117 +1965,117 @@ msgstr "      --keep-header           başlık değiştirilmeden korunur\n"
 msgid "filter output is not terminated with a newline"
 msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir dizge içeriyor"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s argümanı bir noktalama işareti olmalıydı"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "bayt sırası geçersiz: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, fuzzy, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "Bir DOSYA verilmemiÅŸse ya da - verilmiÅŸse standart girdi okunur.\n"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s bir \"-d dizin\" uygulanmasını gerektiriyor"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, fuzzy, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, fuzzy, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s ile %s bağdaşmıyor"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s sadece %s ya da %s ile geçerlidir"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s sadece %s, %s ya da %s ile geçerlidir"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d çevrilmiş ileti"
 msgstr[1] "%d çevrilmiş ileti"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d belirsiz çeviri"
 msgstr[1] ", %d belirsiz çeviri"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d çevrilmemiş ileti"
 msgstr[1] ", %d çevrilmemiş ileti"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Çevirilerin bulunduğu dosyadan ikilik ileti kataloğunu üretir.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  DOSYAİSMİ.po ...            girdi dosyaları\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Ä°ÅŸlem kipi:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2085,7 +2084,7 @@ msgstr ""
 "  -j, --java                  Java kipi: bir Java ResourceBundle sınıfı "
 "üretir\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2095,13 +2094,13 @@ msgstr ""
 "yüksek)\n"
 "                              kabul edilir\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                C# kipi: bir .NET .dll dosyası üretilir\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2110,58 +2109,58 @@ msgstr ""
 "      --csharp-resources      C# özkaynak kipi: bir .NET .resources dosyası\n"
 "                              üretilir\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl kipi:bir tcl/msgcat .msg dosyası üretilir\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt kipi: bir Qt .qm dosyası üretir\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, fuzzy, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --qt                    Qt kipi: bir Qt .qm dosyası üretir\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    Qt kipi: bir Qt .qm dosyası üretir\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                bilinen kip etkinleÅŸtirilir\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Çıktı dosyası - verilmişse, standard çıktı kullanılır.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ÖZKAYNAK     özkaynak ismi\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr "  -l, --locale=YEREL          yerel ismi, \"tr\" ya da \"tr_TR\"\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, fuzzy, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2169,13 +2168,13 @@ msgid ""
 msgstr ""
 "      --tcl               Tcl kipi: girdi bir tcl/msgcat .msg dosyasıdır\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d DİZİN                    sınıf ana dizini\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2186,12 +2185,12 @@ msgstr ""
 "Sınıf ismi, özkaynak ismine yerel isminin bir altçizgi ile eklenmesiyle\n"
 "saptanır. Sınıf DİZİNe yazılacağından -d seçeneği zorunludur.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2199,7 +2198,7 @@ msgid ""
 msgstr ""
 "  -d DİZİN                    yerele bağımlı .dll dosyaları için kök dizin\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2209,17 +2208,17 @@ msgstr ""
 "belirlenen\n"
 "dizinin bir altdizinine yazılır.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl kipte çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d DİZİN                   .msg ileti kataloglarının ana dizini\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2227,22 +2226,22 @@ msgid ""
 msgstr ""
 "-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, fuzzy, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DİZİN                   .msg ileti kataloglarının ana dizini\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2252,7 +2251,7 @@ msgstr ""
 "öntanımlı\n"
 "                              anahtar sözcükler kullanılmamalıdır)\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2260,27 +2259,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Girdi dosyası yorumlaması:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2291,13 +2290,13 @@ msgstr ""
 "domain\n"
 "                              için kısaltma\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          dile bağlı biçem dizgeleri kontrol edilir\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2306,7 +2305,7 @@ msgstr ""
 "      --check-header          başlık girdilerilerinin varlığı ve içeriği\n"
 "                              kontrol edilir\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2315,7 +2314,7 @@ msgstr ""
 "      --check-domain          --output-file seçeneği ile paket yönergeleri\n"
 "                              arasındaki çelişkiler kontrol edilir\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2323,7 +2322,7 @@ msgid ""
 msgstr ""
 "  -C, --check-compatibility   GNU msgfmt, X/Open msgfmt gibi mi davranıyor\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2333,19 +2332,19 @@ msgstr ""
 "      --check-accelerators[=KRKT]  menü öğeleri için tuş belirticiler\n"
 "                                   kontrol edilir\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             çıktıda fuzzy girdiler kullanılır\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=SAYI        dizgeleri SAYI bayta ayarlar (öntanımlı: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2354,91 +2353,91 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               ikilik dosya saçılma tablosunu içermeyecek\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            çeviriler hakkındaki istatistikleri basar\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               daha ayrıntılı çıktı verilir\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "uyarı: PO dosya başlığı ya yok ya da geçersiz\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "uyarı: Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "uyarı: PO dosya başlığı fuzzy\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "uyarı: msgfmt'ın eski sürümleri bu dosyada hata verecektir.\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "dosya ismi olarak paket ismi \"%s\" uygun deÄŸil"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil: önek kullanılacak"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "`domain %s' yönergesi yoksayıldı"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "boş `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "fuzzy `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
@@ -2682,12 +2681,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s paketi için Türkçe çeviriler"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "mevcut karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "girdi dosyasında iki farklı karakter kümesi: \"%s\" ve \"%s\""
@@ -2707,14 +2706,14 @@ msgstr ""
 "\"%s\" paketi girdi dosyası `%s' başlığındaki charset alanında bir karakter\n"
 "kümesi belirtilmemiş"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "hedef karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "uyarı: "
@@ -2807,75 +2806,75 @@ msgstr ""
 "'%s' çıktısı yanlış olabilir.\n"
 "Tek yapılabilecek LC_ALL=C ayarlamaktır.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "çoğul ifadeler negatif değerler üretebilir"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu ama çoğul ifadeler en çok %lu değer üretebilir"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "çoğul ifade sıfırla bölme hatası üretebilir"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "çoğul ifade tamsayı taşması üretebilir"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 "çoğul ifade aritmetik hatalar, özellikle de sıfırla bölme hatası üretebilir"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Aşağıdakiler %s için geçerli mi diye kullanmayı dene:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "ileti kataloğu çoğul çeviriler içeriyor"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ama başlıkta \"plural=İFADE\" gibi bir şey yok"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ama başlıkta \"nplurals=TAMSAYI\" gibi bir şey yok"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "nplurals değeri geçersiz"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "plural= ile verilen ifade geçersiz"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor"
 msgstr[1] "...ama bazı iletiler sadece %lu çoğul biçem içeriyor"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...ama bazı iletiler tek çoğul biçem içeriyor"
 msgstr[1] "...ama bazı iletiler %lu çoğul biçem içeriyor"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2883,93 +2882,98 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen başlıkta\n"
 "\"Plural-Forms: nplurals=TAMSAYI; plural=Ä°FADE;\" gibi bir ÅŸey yok."
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgid_plural' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgstr' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "çoğul biçemler bir GNU gettext özelliğidir"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "içinde '%c' tuş kısayolu eksik"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "çok fazla '%c' tuş kısayolu içeriyor"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "başlıkta `%s' başlık alanı yok\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: girdi \"%s\" kodlama için geçersiz"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: \"%s\" kodlamasından \"%s\" kodlamasına dönüşümde hata"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "girdi dosyasının başlığında bir karakter kümesi belirtilmemiş"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2978,7 +2982,7 @@ msgstr ""
 "\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı,\n"
 "ve iconv() bu dönüşümü desteklemiyor."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2987,8 +2991,8 @@ msgstr ""
 " \"%s\" den \"%s\" e dönüşüm tekrarlar oluşturuyor: bazı msgid'ler aynı "
 "oluyor."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3417,7 +3421,7 @@ msgstr "dizge içinde satır sonu"
 msgid "context separator <EOT> within string"
 msgstr "dizge içinde <EOT> bağlam ayracı"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "bu dosya paket yönergelerini içermeyebilir"
@@ -3438,32 +3442,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "süzgeç ismi eksik"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "nplurals değeri geçersiz"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" dosyası kırpılmış"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "\"%s\" dosyası NUL sonlandırmalı olmayan bir dizge içeriyor"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" dosyası bir GNU .mo dosyas değil"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr ""
@@ -3644,25 +3648,25 @@ msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
 msgid "compilation of C# class failed"
 msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" yazılmak için açılırken hata"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "Geçerli bir Java sınıfı ismi değil: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java sınıfı derlenemedi, lütfen --verbose seçeneğini kullanın ya da\n"
 "$JAVAC ortam değişkenine uygun değeri atayın."
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3774,12 +3778,12 @@ msgstr ""
 "ileti kataloğu çoğul çeviriler içermesine rağmen Tcl ileti kataloğu\n"
 "biçemi çoğul çevirileri desteklemiyor\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uyarı: sonlandırılmamış düzenli ifade"
@@ -3799,7 +3803,7 @@ msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3842,7 +3846,7 @@ msgstr ""
 "%s:%d: Satırın sonunda çokbaytlı dizilim eksik kalmış.\n"
 "Lütfen, doğru kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv başarısızlığı"
@@ -3856,7 +3860,7 @@ msgstr ""
 "%s:%d: Çokbaytlı dizilim geçersiz.\n"
 "Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
@@ -3876,53 +3880,53 @@ msgstr "%s:%d: uyarı: '}' umulan yerde ')' var"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uyarı: ')' umulan yerde '}' var"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "dil `%s' bilinmiyor"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "standart çıktıya yazılırken --join-existing kullanılamaz"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext anahtar sözcükler olmaksızın bulamaz"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "uyarı: `%s' dosyası `%s' uzantısı bilinmiyor; C denenecek"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3930,23 +3934,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=İSİM   çıktıda messages.po yerine İSİM.po kullanılır\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=DOSYA          çıktı belirtilen dosyaya yazılır\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DİZİN      çıktı dosyaları DİZİNe yazılır\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Girdi dosyası dilinin seçimi:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3966,19 +3970,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ile aynı\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Öntanımlı olarak dil, girdi dosyasının uzantısına bakarak saptanır.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3987,24 +3991,24 @@ msgstr ""
 "      --from-code=İSİM        girdi dosyası için yerel kodlaması\n"
 "                              (Python, Tcl, Glade dışında)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Öntanımlı olarak, girdi dosyalarının yerel kodlaması ASCII kabul edilir.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         iletiler mevcut dosyaya bağlanır\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=DOSYA.po girdiler DOSYA.po dosyasından elde edilir\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4015,15 +4019,15 @@ msgid ""
 msgstr ""
 "  -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4031,17 +4035,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Dile özel seçenekler:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           tüm dizgeler çıkarılır\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4055,7 +4059,7 @@ msgstr ""
 "Java,\n"
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4069,7 +4073,7 @@ msgstr ""
 "Java,\n"
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4079,7 +4083,7 @@ msgstr ""
 "      --flag=SÖZCÜK:ARG:İM    SÖZCÜK anahtar sözcüğünün ARG numaralı\n"
 "                              argümanının içindeki dizge için ek im\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4094,67 +4098,72 @@ msgstr ""
 "Java,\n"
 "                               C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ANSI C üçlü harfleri kabul edilir\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (sadece bu diller: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+"  -f, --files-from=DOSYA      girdi dosyalarının listesi DOSYAdan alınır\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (sadece C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (sadece C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 biçemdizgesi tanıma sonuçları ayrıntılı olur\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     çıktı bir Java .properties dosyasına yazılır\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-"  -f, --files-from=DOSYA      girdi dosyalarının listesi DOSYAdan alınır\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --indent                girintili çıktı tarzı\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=DİZGE    çıktı için telif hakkı bilgisi\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4162,17 +4171,17 @@ msgstr ""
 "      --foreign-user          yabancı kullanıcılar için FSF telif hakkı\n"
 "                              çıktıda atlanır\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --copyright-holder=DİZGE    çıktı için telif hakkı bilgisi\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4180,7 +4189,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOSTA@ADRESÄ°\n"
 "                              msgid hatalarının bildirileceği adres\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4190,7 +4199,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=DİZGE]  msgstr girdilerinde önek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4200,7 +4209,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=DÄ°ZGE]  msgstr girdilerinde sonek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4208,31 +4217,31 @@ msgid ""
 msgstr ""
 "Bir --flag argümanı <sözcük>:<argnum>:[pass-]<im> sözdiziminde olmaz: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "standart girdi"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: uyarı: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4241,7 +4250,7 @@ msgstr ""
 "Bir biçim dizgesi içinde kullanılabilirse de %s, %s biçim dizgesi içinde "
 "geçerli değil. Sebebi: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4250,7 +4259,7 @@ msgstr ""
 "Böyle bildirilebilirse de %s, %s biçim dizgesi içinde geçerli değil. Sebebi: "
 "%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4263,7 +4272,7 @@ msgstr ""
 "Lütfen isimli argümarları destekleyen bir biçim dizgesi kullanmayı\n"
 "ve argümanlar için bir demet yerine bir eşleme yapmayı düşünün.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4273,27 +4282,27 @@ msgstr ""
 "gettext(\"\") ile başlık girdilerindeki bilgileri\n"
 "döndürür. Boş dizge değildir.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "anahtar sözcük '%.*s' için anlamı belirsiz argüman belirtimi"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "uyarı: anahtar sözcük '%.*s' için bağlam eksik"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "uyarı: '%.*s' anahtar sözcüğünün çoğul biçimi için bağlam eksik"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "tekil ve çoğul biçimler arasında bağlamsal çelişki"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4306,7 +4315,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS deÄŸiÅŸkenini belirtin; ya da\n"
 "bir --msgid-bugs-address seçeneği kullanın.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "dil `%s' bilinmiyor"
@@ -4419,7 +4428,7 @@ msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\L\") aradeğerlemesi geçersiz"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\U\") aradeğerlemesi geçersiz"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
@@ -4430,7 +4439,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiÄŸi gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4442,7 +4451,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiÄŸi gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4454,7 +4463,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiÄŸi gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4466,7 +4475,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiÄŸi gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4478,7 +4487,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiÄŸi gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4490,22 +4499,22 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiÄŸi gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodlaması bilinmiyor. Onun yerine ASCII ile işlem yapılacak."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: dizge ataması geçersiz"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d:  # dan sonra sayı yok"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: dizge ifade geçersiz"
diff --git a/gettext-tools/po/uk.gmo b/gettext-tools/po/uk.gmo
index 2ebddd2..ea69531 100644
--- a/gettext-tools/po/uk.gmo
+++ b/gettext-tools/po/uk.gmo
diff --git a/gettext-tools/po/uk.po b/gettext-tools/po/uk.po
index 31dbeba..d3d024b 100644
--- a/gettext-tools/po/uk.po
+++ b/gettext-tools/po/uk.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the gettext package.
 #
 # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2013, 2014, 2015.
+# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2013, 2014, 2015, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.7-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-23 13:13+0200\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-01 14:57+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -111,7 +111,7 @@ msgid "Unknown system error"
 msgstr "�евідома �и�темна помилка"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -189,15 +189,15 @@ msgstr "некоректний аргумент source_version дл� compile_ja
 msgid "invalid target_version argument to compile_java_class"
 msgstr "некоректний аргумент target_version дл� compile_java_class"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "не вдаєть�� �творити «%s»"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -223,40 +223,40 @@ msgid "%s subprocess I/O error"
 msgstr "помилка вводу-виводу у дочірньому проце�і %s"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "пам'�ть вичерпано"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "�проба �творенн� потоків обробки зазнала невдачі"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "не вдаєть�� запи�ати у дочірній проце� %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "помилка читанн� з дочірнього проце�у %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 "не вдаєть�� в�тановити неблокуючий режим вводу/виводу дочірнього проце�у %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "помилка зв'�зку з дочірнім проце�ом %s"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "дочірній проце� %s завершив�� з кодом %d"
@@ -295,18 +295,18 @@ msgstr "'"
 msgid "setting permissions for %s"
 msgstr "в�тановленн� прав до�тупу дл� %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "не вдаєть�� �творити канал"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "аварійне завершенн� _open_osfhandle"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "не вдало�� відновити fd %d: помилка dup2"
@@ -338,11 +338,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "У елемента <%s> немає атрибута <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Віддайте команду «%s --help», щоб дізнати�� більше.\n"
@@ -368,7 +368,7 @@ msgstr ""
 "у gettext. Якщо аргумент не вказано, читає правила CLDR зі �тандартного\n"
 "джерела вхідних даних.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -385,21 +385,21 @@ msgstr ""
 "форматі CLDR\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  виве�ти цю довідку та вийти\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               виве�ти інформацію про вер�ію та вийти\n"
@@ -409,20 +409,20 @@ msgstr "  -V, --version               виве�ти інформацію про
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Про помилки повідомл�йте на <bug-gnu-gettext@gnu.org>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -436,10 +436,10 @@ msgstr ""
 "Вам не надаєть�� ЖОД�ИХ Г�Р��ТІЙ, окрім гарантій передбачених законодав�твом.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "�втор програми %s.\n"
@@ -470,37 +470,37 @@ msgid "extra operand %s"
 msgstr "зайвий операнд %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "помилка при відкриванні «%s» дл� читанн�"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "�пецифікації дл� аргументу %u, �к у «%s», немає у «%s»"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "немає �пецифікації формату дл� аргументу %u у «%s»"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -543,8 +543,7 @@ msgstr ""
 "номером %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "кілько�ті �пецифікацій формату у «%s» і «%s» не збігають��"
@@ -869,8 +868,8 @@ msgstr "�пецифікації формату у «%s» та «%s» не є е
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "�пецифікації формату у «%s» не є підмножиною �пецифікацій у «%s»"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "�пецифікаці� формату дл� аргументу «%s» не і�нує у «%s»"
@@ -889,17 +888,17 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "У директиві з номером %u «%c» не може розпочинати назву пол�."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "У директиві з номером %u «%c» не може розпочинати аргумент getattr."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "У директиві з номером %u «%c» не може розпочинати аргумент getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -907,25 +906,25 @@ msgstr ""
 "У директиві з номером %u у визначенні форматуванн� не можна викори�товувати "
 "більший рівень вкладено�ті."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr ""
 "У директиві з номером %u вказано незавершену ін�трукцію щодо форматуванн�."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 "Р�док по�илаєть�� �к на аргументи з назвами, так і на аргументи без назв."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Р�док по�илаєть�� на аргумент з назвою «%s» не�умі�ним �по�обом."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -933,7 +932,7 @@ msgstr ""
 "�пецифікації формату у «%s» очікують відображенн�, а �пецифікації у «%s» "
 "вимагають кортеж"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -941,13 +940,13 @@ msgstr ""
 "�пецифікації формату у «%s» очікують кортеж, а �пецифікації у «%s» очікують "
 "відображенн�"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "�пецифікаці� формату аргументу «%s», тобто «%s», не і�нує у «%s»"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1001,7 +1000,7 @@ msgid ""
 msgstr "Символ, що завершує директиву з номером %u, не є цифрою від 1 до 9."
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1049,11 +1048,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адре�и �и�теми\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Інформативний вивід:\n"
@@ -1125,12 +1124,12 @@ msgstr "кореневим елементом не є елемент «locatingR
 msgid "at most one input file allowed"
 msgstr "допу�каєть�� мак�имум один вхідний файл"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s та %s є взаємовиключними"
@@ -1149,7 +1148,7 @@ msgstr ""
 "Фільтрує повідомленн� каталогу перекладів у відповідно�ті до їх атрибутів,\n"
 "та маніпулює цими атрибутами.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1159,10 +1158,10 @@ msgid ""
 msgstr ""
 "�ргументи, обов'�зкові дл� довгих ключів, є обов'�зковими й дл� коротких.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Розташуванн� вхідного файлу:\n"
@@ -1172,10 +1171,10 @@ msgstr "Розташуванн� вхідного файлу:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  ВХІД�ИЙ_Ф�ЙЛ                вхідний файл PO\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1191,23 +1190,23 @@ msgstr ""
 "Якщо вхідний файл не вказаний, або �кщо вказано -, викори�товуєть�� "
 "�тандартний ввід.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Розташуванн� файлу виводу:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=Ф�ЙЛ      запи�ати вивід у вказаний файл\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1219,7 +1218,7 @@ msgstr ""
 "запи�уєть��\n"
 " у �тандартний вивід.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Вибір повідомлень:\n"
@@ -1340,9 +1339,9 @@ msgid ""
 msgstr ""
 "      --obsolete              �инонім дл� --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1366,17 +1365,17 @@ msgstr ""
 "      --stringtable-input     вхідний файл має �интак�и� NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Подробиці виводу:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1391,17 +1390,17 @@ msgstr ""
 "                              УМОВ� може мати значенн� «always», «never», "
 "«auto» або «html».\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=Ф�ЙЛ_СТИЛЮ      вказати файл правил �тилю CSS дл� --color\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1410,9 +1409,9 @@ msgstr ""
 "екрануванн�\n"
 "                              мови C (типово)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1420,30 +1419,30 @@ msgstr ""
 "  -E, --escape                викори�товувати у виводі �имволи екрануванн�\n"
 "                              мови C, без розширених �имволів\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              запи�увати файл PO, навіть порожній\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                запи�ати файл .po, вживаючи �тиль з "
 "від�тупами\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           не запи�увати р�дки '#: назва_файлу:р�док'\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1451,8 +1450,8 @@ msgstr ""
 "  -n, --add-location          �творювати р�дки '#: назва_файлу:"
 "р�док' (типово)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1460,32 +1459,32 @@ msgstr ""
 "      --strict                запи�увати файл .po, точно відповідний "
 "Uniforum\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     запи�ати файл Java .properties\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    запи�ати файл NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          в�тановити ширину �торінки виводу\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1494,32 +1493,32 @@ msgstr ""
 "      --no-wrap               не розривати на декілька р�дків довгі р�дки\n"
 "                              повідомлень, що довші за ширину �торінки\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           �ортувати вивід\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          �ортувати вивід за розташуванн�м файлів\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "вказано неможливий критерій відбору (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Викори�танн�: %s [П�Р�МЕТР] [ВХІД�ИЙ_Ф�ЙЛ]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1542,23 +1541,23 @@ msgstr ""
 "вказано --use-first, коментарі беруть�� з першого файла PO, у �кому їх було\n"
 "визначено.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  ВХІД�ИЙ_Ф�ЙЛ ...            вхідні файли\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=Ф�ЙЛ       отримати перелік вхідних файлів з Ф�ЙЛ\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Якщо назвою вхідного файлу є -, викори�товуєть�� �тандартний ввід.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1569,7 +1568,7 @@ msgstr ""
 "                              кількі�ть разів, �кщо значенн� не вказано,\n"
 "                              типове значенн� - не�кінчені�ть\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1580,7 +1579,7 @@ msgstr ""
 "                              кількі�ть разів, �кщо не вказано, типове\n"
 "                              значенн� дорівнює 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1589,7 +1588,7 @@ msgstr ""
 "  -u, --unique                �короченн� дл� --less-than=2, вказує\n"
 "                              виводити лише унікальні повідомленн�\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1597,7 +1596,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      вхідні файли мають �интак�и� Java .properties\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1607,12 +1606,12 @@ msgstr ""
 "      --stringtable-input     вхідні файли мають �интак�и� NeXTstep/GNUstep\n"
 "                              .strings\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=��ЗВ�         кодуванн� виводу\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1622,7 +1621,7 @@ msgstr ""
 "                              кожного повідомленн�, не об'єднувати декілька\n"
 "                              перекладів\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1631,7 +1630,7 @@ msgstr ""
 "заголовка\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1737,7 +1736,7 @@ msgstr "це повідомленнÑ� викориÑ�товуєтьÑ�Ñ�, але Ð
 msgid "warning: this message is not used"
 msgstr "попередженн�: це повідомленн� не викори�товуєть��"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1745,12 +1744,12 @@ msgstr[0] "знайдено %d критичну помилку"
 msgstr[1] "знайдено %d критичні помилки"
 msgstr[2] "знайдено %d критичних помилок"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "необхідно вказати принаймні два файли"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1771,7 +1770,7 @@ msgstr ""
 "беруть�� з першого файла PO, у �кому вони були визначені. Коментарі з назвою\n"
 "файлу та номером р�дка зберігають�� дл� у�іх файлів PO.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1781,7 +1780,7 @@ msgstr ""
 "                              кількі�тю визначень, �кщо чи�ло не вказано,\n"
 "                              типове значенн� дорівнює 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1829,7 +1828,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                �тиль виводу Uniforum\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "не вказано вхідний файл"
@@ -2013,76 +2012,76 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "фільтрувати виведені дані, що не завершують�� �имволом нового р�дка"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "аргумент %s повинен бути поодиноким знаком пунктуації"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "неправильно вказано пор�док байтів: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "�кщо вказано %s та %s, файл вхідних даних вказувати не �лід"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s вимагає вказати параметр \"-d каталог\""
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s вимагає вказати параметр \"-l локаль\""
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "дл� %s �лід вказати �пецифікацію «--template шаблон»"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "дл� %s �лід вказати �пецифікацію «-o файл»"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "не можна одноча�но викори�товувати %s та %s у %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s допу�каєть�� лише з %s або %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s допу�каєть�� лише з %s, %s або %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "не вдало�� знайти правила ITS дл� %s"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -2090,7 +2089,7 @@ msgstr[0] "%d перекладене повідомленн�"
 msgstr[1] "%d перекладених повідомленн�"
 msgstr[2] "%d перекладених повідомлень"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -2098,7 +2097,7 @@ msgstr[0] ", %d неточний переклад"
 msgstr[1] ", %d неточних переклади"
 msgstr[2] ", %d неточних перекладів"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -2106,27 +2105,27 @@ msgstr[0] ", %d неперекладене повідомленн�"
 msgstr[1] ", %d неперекладених повідомленн�"
 msgstr[2] ", %d неперекладених повідомлень"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Викори�танн�: %s [П�Р�МЕТР] назва_файлу.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Створює двійковий каталог повідомлень з тек�тового опи�у.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  назва_файлу.po ...          вхідні файли\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режим роботи:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2134,7 +2133,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  режим Java: �творює Java ResourceBundle кла�\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2143,12 +2142,12 @@ msgstr ""
 "      --java2                 �к і --java, вважаєть�� Java2 (JDK 1.2 чи "
 "вище)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                режим C#: �творює файли .NET .dll\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2157,19 +2156,19 @@ msgstr ""
 "      --csharp-resources      режим C# ре�ур�ів: �творює файл .NET ."
 "resources\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   режим Tcl: �творює файл tcl/msgcat .msg\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    режим Qt: �творює файл Qt .qm\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2177,56 +2176,56 @@ msgstr ""
 "      --desktop               режим запи�у до desktop: �творити файл ."
 "desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   режим XML: �творити файл XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                перейти у режим відповідно�ті до Uniforum\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 "Якщо �к файл виводу вказано -, вивід відбуватиметь�� у �тандартний вивід.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Розташуванн� вхідного файлу у режимі Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=РЕСУРС       назва ре�ур�у\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr "  -l, --locale=ЛОК�ЛЬ         назва локалі, або мова або мова_КР�Ї��\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr "      --source                �творити файл .java, а не файл .class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d К�Т�ЛОГ                  базовий каталог ієрархії каталогів кла�ів\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2238,12 +2237,12 @@ msgstr ""
 "пі�л� знаку підкре�ленн�.  Параметр -d є обов'�зковим.  Кла� запи�уєть��\n"
 "у вказаний каталог.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Розташуванн� вхідного файлу у режимі C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2252,7 +2251,7 @@ msgstr ""
 "  -d К�Т�ЛОГ                  базовий каталог залежних від локалі .dll "
 "файлів\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2261,18 +2260,18 @@ msgstr ""
 "Параметри -l та -d є обов'�зковими.  Файл .dll запи�уєть�� у підкаталог\n"
 "вказаного каталогу, назва �кого залежить від локалі.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Розташуванн� вхідного файлу у режимі Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d К�Т�ЛОГ                  базовий каталог каталогів .msg повідомлень\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2281,24 +2280,24 @@ msgstr ""
 "Параметри -l та -d є обов'�зковими.  Файл .msg запи�уєть�� у вказаний "
 "каталог.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Параметри режиму запи�у desktop:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 "  --template=Ш�БЛО�           файл .desktop, �кий �лід викори�тати �к "
 "шаблон\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d К�Т�ЛОГ                  базовий каталог дл� файлів .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2307,7 +2306,7 @@ msgstr ""
 "  -kСЛОВО, --keyword=СЛОВО    шукати СЛОВО �к додаткове ключове �лово\n"
 "  -k, --keyword               не викори�товувати типових ключових �лів\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2318,28 +2317,28 @@ msgstr ""
 "файли вхідних даних буде прочитано з каталогу, а не з аргументів командного\n"
 "р�дка.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Параметри режиму XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=��ЗВ�         розпізнавати вказану мову XML\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 "  --template=Ш�БЛО�           файл XML, �кий �лід викори�тати �к шаблон\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Інтерпретаці� вхідного файлу:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2350,13 +2349,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          перевірити залежний від мови формат р�дків\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2365,7 +2364,7 @@ msgstr ""
 "      --check-header          перевірити на�вні�ть та вмі�т елементу "
 "заголовка\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2375,7 +2374,7 @@ msgstr ""
 "та\n"
 "                                параметром --output-file\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2384,7 +2383,7 @@ msgstr ""
 "  -C, --check-compatibility   перевірити, що GNU msgfmt поводить�� �к X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2395,12 +2394,12 @@ msgstr ""
 "у\n"
 "                                пунктах меню\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             виводити елементи неточного перекладу\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2408,7 +2407,7 @@ msgstr ""
 "  -a, --alignment=ЧИСЛО       форматувати р�дки по ЧИСЛО байт у р�дку "
 "(типово: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2421,92 +2420,92 @@ msgstr ""
 "                                (зворотний (big) або пр�мий (little),\n"
 "                                 типовий залежить від платформи)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               двійковий файл не буде включати хеш-таблицю\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            виве�ти �тати�тику про переклад\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               збільшити рівень докладно�ті виводу\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "попередженн�: заголовок файла PO від�утній або некоректний\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "попередженн�: перетворенн� кодувань �имволів не працюватиме\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "попередженн�: заголовок файла PO позначений �к нечіткий переклад\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "попередженн�: �тарі вер�ії msgfmt �прийматимуть це �к помилку\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "назва домену «%s» не може викори�товувати�ь �к назва файлу"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "назва домену «%s» не може викори�товувати�ь �к назва файлу: буде викори�тано "
 "префік�"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "директиву «domain %s» проігноровано"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "порожній елемент «msgstr» проігноровано"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "елемент з нечітким перекладом «msgstr» проігноровано"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: попередженн�: вихідний файл мі�тить нечіткий переклад"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s не і�нує"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s і�нує, але непридатний до читанн�"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "помилка при читанні «%s»"
@@ -2747,12 +2746,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Переклад україн�ькою дл� пакету %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "вказане кодуванн� «%s» не є перено�ною назвою кодуванн�"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "у вхідному файлі два різні кодуванн� «%s» та «%s»"
@@ -2772,14 +2771,14 @@ msgstr ""
 "домен «%s» у вхідному файлі «%s» не мі�тить елемент заголовку, �кий вказує "
 "кодуванн�"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "цільове кодуванн� «%s» не є перено�ною назвою кодуванн�."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "попередженн�: "
@@ -2872,27 +2871,27 @@ msgstr ""
 "Вивід «%s» може бути некоректним.\n"
 "Можливим обхідним шл�хом є в�тановленн� LC_ALL=C.\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "розширенн� множинних форм можуть давати від'ємні значенн�"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu, але розширенн� множинних форм можуть давати значенн� такі ж "
 "великі �к і %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "розширенн� множинних форм можуть призводити до діленн� на нуль"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr ""
 "розширенн� множинних форм можуть призводити до переповненн� цілого значенн�"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2900,37 +2899,37 @@ msgstr ""
 "розширенн� множинних форм можуть призводити до арифметичних виключних "
 "�итуацій, можливе діленн� на нуль"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Спробуйте викори�тати на�тупне, що є правильним дл� %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "каталог повідомлень має переклади з множинними формами"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "але заголовок не мі�тить атрибут \"plural=ВИР�З\""
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "але заголовок не мі�тить атрибут \"nplurals=ЦІЛЕ_ЧИСЛО\""
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "неправильне значенн� nplurals"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "неправильне значенн� plural"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2938,7 +2937,7 @@ msgstr[0] "але де�кі повідомленн� мають лише %lu м
 msgstr[1] "але де�кі повідомленн� мають лише %lu множинні форми"
 msgstr[2] "але де�кі повідомленн� мають лише %lu множинних форм"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
@@ -2946,7 +2945,7 @@ msgstr[0] "але деÑ�кі повідомленнÑ� мають %lu множиÐ
 msgstr[1] "але де�кі повідомленн� мають %lu множинні форми"
 msgstr[2] "але де�кі повідомленн� мають %lu множинних форм"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2954,90 +2953,95 @@ msgstr ""
 "каталог повідомлень має переклад з множинними формами, але заголовок не "
 "мі�тить \"Plural-Forms: nplurals=ЦІЛЕ; plural=ВИР�З;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "обидва елементи «msgid» та «msgid_plural» не починають�� одноча�но з «\\n»"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "обидва елементи «msgid» та «msgstr[%u]» не починають�� одноча�но з «\\n»"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "елементи «msgid» та «msgstr» не починають�� одноча�но з «\\n»"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "елементи «msgid» та «msgid_plural» не закінчують�� одноча�но на «\\n»"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "елементи «msgid» та «msgstr[%u]» не закінчують�� одноча�но на «\\n»"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "елементи «msgid» та «msgstr» не закінчують�� одноча�но на «\\n»"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "обробка множинних форм є розширенн�м GNU gettext"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "у msgstr від�утній �имвол клавішного ак�елератора «%c»"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr мі�тить надто багато �имволів клавішних ак�елераторів «%c»"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "поле заголовка «%s» в�е ще мі�тить початкове типове значенн�\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "у заголовку немає пол� «%s»\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "Багатокрапка ASCII («...») замі�ть �имволу багатокрапки Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "у видимих кори�тувачеві р�дках ви�влено пробіл перед багатокрапкою"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Викори�тано подвійні лапки ASCII замі�ть лапок Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Викори�тано одинарні лапки ASCII замі�ть лапок Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "Кружок ASCII («%c») замі�ть �имволу Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: вхідний потік не є коректним дл� кодуванн� «%s»"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: помилка при перетворенні кодуванн� з «%s» на «%s»"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "вхідний файл не мі�тить заголовок, що вказує кодуванн�"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3046,7 +3050,7 @@ msgstr ""
 "�е вдаєть�� перетворити з «%s» на «%s». %s викори�товує iconv(), а iconv() "
 "не підтримує це перетворенн�."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3055,8 +3059,8 @@ msgstr ""
 "Перетворенн� з «%s» у «%s» призводить до по�ви дублікатів: де�кі msgid ключі "
 "�тануть однаковими."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3493,7 +3497,7 @@ msgstr "кінець р�дка по�еред р�дка"
 msgid "context separator <EOT> within string"
 msgstr "розділювач контек�ту <EOT> по�еред р�дка"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "цей файл не може мі�тити доменних директив"
@@ -3514,31 +3518,31 @@ msgstr "незавершена назва групи"
 msgid "invalid non-blank character"
 msgstr "некоректний непорожній �имвол"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "пі�л� «%s» пропущено «=»"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "некоректний непорожній р�док"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "файл «%s» обрізаний"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "файл «%s» мі�тить р�док з не-NUL завершенн�м"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "файл «%s» не у GNU .mo форматі"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файл «%s» мі�тить р�док з не-NUL завершенн�м, у %s"
@@ -3719,24 +3723,24 @@ msgstr "помилка при компіл�ції кла�у C#, �пробуй
 msgid "compilation of C# class failed"
 msgstr "помилка при компіл�ції кла�у C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "помилка при відкриванні «%s» дл� запи�у"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "не є правильною назвою кла�у Java: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "помилка при компіл�ції кла�у Java, �пробуйте --verbose або в�тановіть $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3849,12 +3853,12 @@ msgstr ""
 "каталог повідомлень мі�тить переклад з множинними формами\n"
 "але формат каталогу повідомлень Tcl не підтримує множинні форми\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: попередженн�: незавершений р�док"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: попередженн�: незавершений регул�рний вираз"
@@ -3874,7 +3878,7 @@ msgstr "%s:%d: попередженн�: незавершена �имвольн
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: попередженн�: незавершений �имвольний літерал"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Вкажіть вхідне кодуванн� у параметрі --from-code."
 
@@ -3914,7 +3918,7 @@ msgstr ""
 "%s:%d: �езавершена мультибайтова по�лідовні�ть наприкінці р�дка.\n"
 "Вкажіть вхідне кодуванн� у параметрі --from-code.\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: помилка iconv"
@@ -3928,7 +3932,7 @@ msgstr ""
 "%s:%d: �еправильна мультибайтова по�лідовні�ть.\n"
 "Вкажіть вхідне кодуванн� у параметрі --from-code.\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: попередженн�: неправильний �имвол Юнікоду"
@@ -3948,41 +3952,41 @@ msgstr "%s:%d: попередженн�: знайдено ')' там де очі
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: попередженн�: знайдено «}» там де очікувала�ь ')'"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 "«%s» не є коректною назвою кодуванн�. Викори�товуємо резервне кодуванн� "
 "ASCII.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "невідома перевірка �интак�и�у, «%s»"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "невідомий тип завершенн� реченн�, «%s»"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing не може викори�товувати�ь, �кщо вивід направл�єть�� у "
 "�тандартний вивід"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може працювати без вказаних ключових �лів дл� пошуку"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "попередженн�: файла правил ITS «%s» не і�нує"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -3990,18 +3994,18 @@ msgstr ""
 "попередженн�: файла правил ITS «%s» не і�нує; перевірте, чи належним чином "
 "в�тановлено gettext"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "попередженн�: у файлі «%s» невідоме розширенн� «%s»; �проба викори�тати C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Вит�гує р�дки дл� перекладу з вказаних вхідних файлів.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4010,12 +4014,12 @@ msgstr ""
 "  -d, --default-domain=��ЗВ�  виводити у файл ��ЗВ�.po (замі�ть messages."
 "po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=Ф�ЙЛ           запи�увати вивід у вказаний файл\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4023,12 +4027,12 @@ msgstr ""
 "  -p, --output-dir=К�Т�ЛОГ    файли виводу будуть �творені у каталозі "
 "К�Т�ЛОГ\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Вибір мови вхідного файлу:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4049,19 +4053,19 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   �короченн� дл� --language=C++\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Типово, мова визначаєть�� за розширенн�м назви вхідного файлу.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4070,24 +4074,24 @@ msgstr ""
 "      --from-code=��ЗВ�       кодуванн� дл� вхідних файлів\n"
 "                                (за вин�тком Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Типово, вважаєть��, що вхідні файли у кодуванні ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         об'єднати повідомленн� з і�нуючим файлом\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=Ф�ЙЛ.po  елементи з Ф�ЙЛ.po не будуть вит�гувати�ь\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4104,18 +4108,18 @@ msgstr ""
 "р�дки\n"
 "                               ключових �лів у файлі виведених даних\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=��ЗВ�           виконати �интак�ичну перевірку повідомлень\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4126,17 +4130,17 @@ msgstr ""
 "                                (одинарний пробіл, типовий варіант, \n"
 "                                 або подвійний пробіл)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Параметри о�обливі дл� мови:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           вит�гнути у�і р�дки\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4151,7 +4155,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4166,7 +4170,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-код, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4176,7 +4180,7 @@ msgstr ""
 "      --flag=СЛОВО:�РГ:ОЗ��К� додаткова ознака дл� р�дків по�еред номера\n"
 "                              аргументу �РГ ключового �лова СЛОВО\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4191,65 +4195,70 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             розпізнавати ANSI C trigraph-и на вході\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (лише мови C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=Ф�ЙЛ              за�то�увати правила ITS з Ф�ЙЛа\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (лише мови, за�новані на XML)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    розпізнавати р�дки у Qt форматі\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (лише мова C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   розпізнати р�дки у форматуванні KDE 4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 розпізнавати р�дки у форматі Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 докладніший результат пошуку р�дків формату\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     виводити у файл Java .properties\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=Ф�ЙЛ              за�то�увати правила ITS з Ф�ЙЛа\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               запи�увати коментарі itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=РЯДОК  в�тановити вла�ника автор�ьких прав\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4257,20 +4266,20 @@ msgstr ""
 "      --foreign-user          пропу�кати у виводі FSF copyright дл� "
 "�торонніх кори�тувачів\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 "      --package-name=П�КУ�ОК  в�тановити назву пакунка у виведених даних\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=ВЕРСІЯ   в�тановити вер�ію пакунка у виведених "
 "даних\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4278,7 +4287,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@�ДРЕС�   адре�а звітуванн� про помилки у "
 "msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4289,7 +4298,7 @@ msgstr ""
 "елементів\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4300,7 +4309,7 @@ msgstr ""
 "елементів\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4309,31 +4318,31 @@ msgstr ""
 "�ргумент --flag не підтримує �интак�и� <ключове_�лово>:<argnum>:"
 "[pass-]<flag>: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "�тандартний ввід"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Символ, що не належить до ASCII, у %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Коментар не у форматі ASCII на позиції або перед %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Р�док не у форматі ASCII на позиції %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: попередженн�: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4342,7 +4351,7 @@ msgstr ""
 "Хоча й викори�товуєть�� у позиції р�дку формату, %s не є правильним %s "
 "р�дком формату. Причина: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4351,7 +4360,7 @@ msgstr ""
 "Хоча й за�влений �к такий, %s не є правильним %s р�дком формату. Причина: "
 "%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4364,7 +4373,7 @@ msgstr ""
 "Замі�ть кортежу аргументів, викори�товуйте р�док формату з аргументами,\n"
 "що мають назву та їх під�тановку.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4374,29 +4383,29 @@ msgstr ""
 "gettext(\"\") повертає елемент заголовку\n"
 "метаінформації, а не порожній р�док.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неоднозначно вказане ключове �лово '%.*s'"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "попередженн�: від�утній контек�т дл� ключового �лова '%.*s'"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "попередженн�: від�утній контек�т дл� множинного аргументу ключового �лова "
 "'%.*s'"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "невідповідні�ть контек�ту між формою однини та множини"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4408,7 +4417,7 @@ msgstr ""
 "тут змінну MSGID_BUGS_ADDRESS; у іншому випадку\n"
 "вкажіть --msgid-bugs-address аргумент командного р�дка.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "невідома мова «%s»"
@@ -4517,7 +4526,7 @@ msgstr "%s:%d: неправильна інтерполÑ�ціÑ� (\"\\L\") 8-біÑ
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неправильна інтерпол�ці� (\"\\U\") 8-бітного �имволу \"%c\""
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4525,7 +4534,7 @@ msgstr ""
 "Вкажіть вхідне кодуванн� у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4536,7 +4545,7 @@ msgstr ""
 "Вкажіть вхідне кодуванн� у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4547,7 +4556,7 @@ msgstr ""
 "Вкажіть вхідне кодуванн� у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4558,7 +4567,7 @@ msgstr ""
 "Вкажіть вхідне кодуванн� у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4569,7 +4578,7 @@ msgstr ""
 "Вкажіть вхідне кодуванн� у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4580,22 +4589,22 @@ msgstr ""
 "Вкажіть вхідне кодуванн� у параметрі --from-code або у коментарі,\n"
 "згідно http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "�евідоме кодуванн� «%s». Вважаєть�� кодуванн� ASCII."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: неправильне визначенн� р�дка"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: пі�л� знаку # від�утнє чи�ло"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: неправильний �имвольний вираз"
diff --git a/gettext-tools/po/vi.gmo b/gettext-tools/po/vi.gmo
index 3a5fe7e..dde3a26 100644
--- a/gettext-tools/po/vi.gmo
+++ b/gettext-tools/po/vi.gmo
diff --git a/gettext-tools/po/vi.po b/gettext-tools/po/vi.po
index 583b7d8..a5ee6c4 100644
--- a/gettext-tools/po/vi.po
+++ b/gettext-tools/po/vi.po
@@ -1,16 +1,16 @@
 # Vietnamese Translation for gettext-tools.
 # Bản dịch tiếng Việt dành cho gettext-tools.
-# Copyright © 2015 Free Software Foundation, Inc.
+# Copyright © 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2010.
-# Trần Ng�c Quân <vnwildman@gmail.com>, 2012-2014, 2015.
+# Trần Ng�c Quân <vnwildman@gmail.com>, 2012-2014, 2015, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.19.7-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.8-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
-"PO-Revision-Date: 2015-12-24 08:08+0700\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
+"PO-Revision-Date: 2016-06-02 07:42+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -112,7 +112,7 @@ msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -194,15 +194,15 @@ msgstr ""
 "đối số “target_version� (phiên bản đích) không hợp lệ đối với "
 "“compile_java_class� (biên dịch lớp Java)"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "gặp lỗi khi tạo “%s�"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -226,39 +226,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s lỗi V/R tiến trình con"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "cạn bộ nhớ"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "việc tạo tuyến trình gặp lỗi"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "gặp lỗi khi ghi vào tiến trình phụ %s"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "gặp lỗi khi đ�c từ tiến trình con %s"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "không thể cài đặt V/R không chặn đối với tiến trình con %s"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "gặp lỗi khi liên lạc với tiến trình con %s"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "tiến trình con %s đã kết thúc với mã thoát %d"
@@ -297,18 +297,18 @@ msgstr "�"
 msgid "setting permissions for %s"
 msgstr "đang đặt quy�n hạn cho %s"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "không thể tạo ống dẫn"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle gặp lỗi"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "không phục hồi được bộ mô tả tập tin %d: dup2 gặp lỗi"
@@ -340,11 +340,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr "Phần tử <%s> không được phép có thuộc tính <%s>"
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Hãy thử lệnh “%s --help� để xem thông tin thêm.\n"
@@ -370,7 +370,7 @@ msgstr ""
 "phù hợp với các dùng gettext. Nếu không đưa ra tham số nào, nó\n"
 "đ�c quy tắc số nhi�u CLDR từ đầu vào tiêu chuẩn.\n"
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -386,21 +386,21 @@ msgstr ""
 "  -c, --cldr                  in quy tắc số nhi�u theo định dạng CLDR\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  hiện trợ giúp này rồi thoát\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               xuất thông tin phiên bản rồi thoát\n"
@@ -410,11 +410,11 @@ msgstr "  -V, --version               xuất thông tin phiên bản rồi thoá
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Hãy thông báo lỗi cho <bug-gnu-gettext@gnu.org>.\n"
@@ -422,11 +422,11 @@ msgstr ""
 "html>.\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -440,10 +440,10 @@ msgstr ""
 "KHÔNG CÓ BẢO HÀNH GÌ CẢ, với đi�u kiện được pháp luật cho phép.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Viết bởi %s.\n"
@@ -474,18 +474,18 @@ msgid "extra operand %s"
 msgstr "gặp một toán hạng thừa %s"
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "gặp lỗi khi mở “%s� để đ�c"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
@@ -493,19 +493,19 @@ msgstr ""
 "một đặc tả định dạng cho đối số %u, như trong “%s�, không tồn tại trong “%s�"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "một đặc tả định dạng cho đối số %u cũng không tồn tại trong “%s�"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -547,8 +547,7 @@ msgstr ""
 "Chuỗi này tham chiệu đến đối số có số %u nhưng mà b� qua đối số có số %u."
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "“%s� và “%s� không có cùng một số các đặc tả định dạng"
@@ -864,8 +863,8 @@ msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "đặc tả định dạng trong “%s� không phải tập hợp con của đặc tả trong “%s�"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "đặc tả định dạng cho đối số “%s� không tồn tại trong “%s�"
@@ -884,19 +883,19 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "Trong chỉ thị số %u, “%c� không thể bắt đầu bằng một tên trư�ng."
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr ""
 "Trong chỉ thị số %u, “%c� không thể bắt đầu bằng một đối số getattr (lấy "
 "thuộc tính?)."
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "Trong chỉ thị số %u, “%c� không thể bắt đầu bằng một đối số getitem."
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
@@ -904,12 +903,12 @@ msgstr ""
 "Trong chỉ thị số %u, không cho phép lồng nhau thêm nữa trong bộ chỉ định "
 "định dạng."
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "Trong chỉ thị số %u, có một chỉ thị định dạng chưa được kết thúc."
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -917,14 +916,14 @@ msgstr ""
 "Chuỗi tham chiếu đến đối số bằng cả hai tên đối số và đặc tả đối số không "
 "tên."
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "Chuỗi tham chiếu đến đối số tên “%s� bằng nhi�u cách không tương thích với "
 "nhau."
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
@@ -932,7 +931,7 @@ msgstr ""
 "đặc tả định dạng trong “%s� cần một ánh xạ, còn đặc tả trong “%s� cần một "
 "tuple (tạm dịch: bản ghi, một dòng dữ liệu)"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
@@ -940,14 +939,14 @@ msgstr ""
 "đặc tả định dạng trong “%s� cần một tuple (tạm dịch: bản ghi, một dòng dữ "
 "liệu), còn đặc tả trong “%s� cần một ánh xạ"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "đặc tả định dạng cho đối số “%s�, như trong “%s�, không tồn tại trong “%s�"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -1002,7 +1001,7 @@ msgstr "Ký tự kết thúc chỉ thị số %u không phải chữ số nằm
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -1049,11 +1048,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            các địa chỉ cho tên máy đó\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Kết xuất thông tin:\n"
@@ -1125,12 +1124,12 @@ msgstr "phần tử gốc không phải là \"locatingRules\""
 msgid "at most one input file allowed"
 msgstr "cho phép nhi�u nhất một tập tin đầu vào"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s và %s loại từ lẫn nhau"
@@ -1149,7 +1148,7 @@ msgstr ""
 "L�c các chuỗi của phân loại thông dịch tùy theo thuộc tính,\n"
 "cũng thao tác thuộc tính.\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1160,10 +1159,10 @@ msgstr ""
 "Tất cả đối số bắt buộc phải có với tùy ch�n dài cũng bắt buộc với tùy ch�n "
 "ngắn.\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "Vị trí tập tin đầu vào:\n"
@@ -1173,10 +1172,10 @@ msgstr "Vị trí tập tin đầu vào:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  TẬP_TIN_�ẦU_VÀO             tập tin PO đầu vào\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1191,23 +1190,23 @@ msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Không đưa ra tập tin đầu vào, hay nó là “-� thì đ�c đầu vào tiêu chuẩn.\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "Vị trí tập tin đầu ra:\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=TẬP_TIN   ghi kết xuất vào TẬP TIN này\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1218,7 +1217,7 @@ msgstr ""
 "Kết quả được ghi ra đầu ra tiêu chuẩn nếu không chỉ ra tập tin kết xuất,\n"
 "hoặc nếu nó là “-�.\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "Ch�n chuỗi:\n"
@@ -1343,9 +1342,9 @@ msgstr ""
 "      --obsolete              tương đương với “--only-obsolete --clear-"
 "obsolete�\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1370,17 +1369,17 @@ msgstr ""
 "      --stringtable-input     tập tin đầu vào có cú pháp .strings kiểu\n"
 "                              NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "Chi tiết kết xuất:\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1398,18 +1397,18 @@ msgstr ""
 "                                 * auto       tá»± Ä‘á»™ng\n"
 "                                 * html       HTML.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 "      --style=TẬP_TIN         chỉ định tập tin quy tắc kiểu dáng CSS cho\n"
 "                              --color (màu)\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1417,9 +1416,9 @@ msgstr ""
 "  -e, --no-escape             không dùng ký tự thoát C trong kết xuất (mặc "
 "định)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1427,30 +1426,30 @@ msgstr ""
 "  -E, --escape                dùng ký tự thoát C trong kết xuất,\n"
 "                              không dùng ký tự mở rộng\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po              ghi ra tập tin PO ngay cả khi nó trống rỗng\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                ghi ra tập tin PO có thụt l�\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           không ghi dòng kiểu “#: tên_tập_tin:"
 "số_hiệu_dòng�\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1459,15 +1458,15 @@ msgstr ""
 "số_hiệu_dòng�\n"
 "                              (mặc định)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                xuất tập tin PO tùy theo Uniforum chính xác\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
@@ -1476,9 +1475,9 @@ msgstr ""
 "  -p, --properties-output     xuất tập tin .properties (thuộc tính) kiểu "
 "Java\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1486,16 +1485,16 @@ msgstr ""
 "      --stringtable-output    ghi ra tập tin .strings (chuỗi)\n"
 "                              kiểu NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=S�              đặt chi�u rộng của trang kết xuất\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1505,31 +1504,31 @@ msgstr ""
 "hơn\n"
 "                              chi�u rộng trang kết xuất\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           tạo ra kết xuất được sắp xếp\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sắp xếp kết xuất theo vị trí tập tin\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "xác định tiêu chuẩn lựa ch�n không thể sử dụng được (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN_�ẦU_VÀO]…\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1554,25 +1553,25 @@ msgstr ""
 "chúng sẽ được lấy từ tập tin PO thứ nhất có chuỗi được dịch.\n"
 "Vị trí tập tin từ m�i tập tin PO sẽ được tích lũy.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  TẬP_TIN_�ẦU_VÀO …           những tập tin đầu vào\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=TẬP_TIN    lấy từ tập tin này danh sách các tập tin đầu "
 "vào\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Nếu tập tin đầu vào là “-� thì đ�c từ đầu vào tiêu chuẩn.\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1581,7 +1580,7 @@ msgstr ""
 "  -<, --less-than=S�          in ra các chuỗi có ít hơn S� các l�i\n"
 "                              định nghĩa; không bật thì mặc định là vô hạn\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1590,7 +1589,7 @@ msgstr ""
 "  ->, --more-than=S�          in ra các chuỗi có nhi�u hơn S� các l�i\n"
 "                              định nghĩa; không bật thì mặc định là 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1600,7 +1599,7 @@ msgstr ""
 "hơn 2),\n"
 "                              yêu cầu in ra chỉ những chuỗi duy nhất\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
@@ -1609,7 +1608,7 @@ msgstr ""
 "  -P, --properties-input      tập tin đầu vào có cú pháp kiểu .properties\n"
 "                              (thuộc tính) của Java\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1619,12 +1618,12 @@ msgstr ""
 "      --stringtable-input     tập tin đầu vào có cú pháp .strings (chuỗi)\n"
 "                              kiểu NeXTstep/GNUstep\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=MÃ            bộ ký tự cho kết xuất\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1633,7 +1632,7 @@ msgstr ""
 "      --use-first             dùng bản dịch đầu tiên cho mỗi chuỗi,\n"
 "                              không trộn nhi�u bản dịch\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
@@ -1643,7 +1642,7 @@ msgstr ""
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1749,18 +1748,18 @@ msgstr "chuỗi này được dùng còn chưa được định nghĩa trong %s"
 msgid "warning: this message is not used"
 msgstr "cảnh báo: chuỗi này không được dùng"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "tìm thấy %d lỗi nghiêm tr�ng"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "phải chỉ ra ít nhất hai tập tin"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1781,7 +1780,7 @@ msgstr ""
 "trích sẽ được bảo tồn, nhưng chỉ từ tập tin PO thứ nhất đã định nghĩa chúng.\n"
 "Vị trí tập tin từ m�i tập tin PO này sẽ được tích lũy.\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1790,7 +1789,7 @@ msgstr ""
 "  ->, --more-than=S�          in các chuỗi chứa nhi�u định nghĩa hơn\n"
 "                              S� này; không bật thì mặc định là 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1839,7 +1838,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                xuất dữ liệu kiểu Uniforum chính xác\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "chưa đưa ra tập tin đầu vào"
@@ -2028,115 +2027,115 @@ msgstr ""
 msgid "filter output is not terminated with a newline"
 msgstr "đầu ra bộ l�c không được kết thúc bằng một ký hiệu dòng mới"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "đối số cho “%s� nên là một ký tự chấm câu riêng lẻ"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "thứ tự xếp các byte (biểu diễn số nguyên) không hợp lệ: %s"
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "không đưa ra tập tin đầu vào nếu “%s� và “%s� được chỉ định"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s cần một đặc tả “-d directory� (thư mục)"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s cần một đặc tả “-l locale� (mi�n địa phương)"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s cần một đặc tả “--template template�"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s cần một đặc tả “-o tập-tin�"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s và %s loại từ lẫn nhau trong %s"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s chỉ hợp lệ với %s hay %s"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s chỉ hợp lệ với %s, %s hay %s"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "không thể định vị quy tắc ITS cho “%s�"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d chuỗi đã dịch"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d chuỗi tạm dịch"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d chuỗi chưa dịch"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Cách dùng: %s [TÙY_CHỌN] tên_tập_tin.po …\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Tạo ra catalog bản dịch nhị phân từ mô tả thông dịch kiểu văn bản.\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  tên_tập_tin.po …            những tập tin đầu vào\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Chế độ thao tác:\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -2145,7 +2144,7 @@ msgstr ""
 "  -j, --java                  chế độ Java: tạo ra lớp ResourceBundle\n"
 "                               (bó tài nguyên) kiểu Java\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -2154,13 +2153,13 @@ msgstr ""
 "      --java2                 giống như --java, và coi là Java2\n"
 "                               (JDK 1.2 hay sau)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                chế độ C#: tạo ra một tập tin .dll kiểu .NET\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2170,7 +2169,7 @@ msgstr ""
 "resources\n"
 "                              (tài nguyên) kiểu .NET\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2178,13 +2177,13 @@ msgstr ""
 "      --tcl                   chế độ Tcl: tạo ra một tập tin .msg kiểu tcl/"
 "msgcat\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 "      --qt                    chế độ Qt: tạo ra một tập tin .qm kiểu Qt\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
@@ -2192,34 +2191,34 @@ msgstr ""
 "      --desktop               chế độ Desktop Entry: tạo một tập tin ."
 "desktop\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --xml                   chế độ XML: tạo tập tin XML\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                bật chế độ Uniforum chính xác (chặt chẽ)\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Nếu tập tin xuất là “-� thì kết xuất được ghi vào đầu ra tiêu chuẩn.\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ Java:\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=TÀI_NGUYÊN   tên của tài nguyên\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2228,7 +2227,7 @@ msgstr ""
 "  -l, --locale=MIỀN_�ỊA_PHƯƠNG tên mi�n địa phương, hoặc ngôn ngữ hoặc\n"
 "                              ngôn-ngữ_quốc-gia (v.d. “vi� hay “vi_VN�)\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2237,13 +2236,13 @@ msgstr ""
 "      --source                sản sinh tập tin .java, thay cho tập tin ."
 "class\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d THƯ_MỤC                  thư mục cơ sở của phân cấp thư mục lớp\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2255,12 +2254,12 @@ msgstr ""
 "vào tên tài nguyên, định giới bằng dấu gạch dưới. Tùy ch�n “-d� bắt buộc\n"
 "phải sử dụng. Lớp được ghi dưới thư mục đã chỉ ra.\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ C#:\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -2269,7 +2268,7 @@ msgstr ""
 "  -d THƯ_MỤC                  thư mục cơ sở cho tập tin dạng .dll\n"
 "                              phụ thuộc vào mi�n địa phương\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2279,18 +2278,18 @@ msgstr ""
 "Tập tin .dll được ghi trong thư mục con của thư mục đã đưa ra\n"
 "có tên phụ thuộc vào mi�n địa phương.\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ Tcl:\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d THƯ_MỤC                  thư mục cơ sở của catalog bản dịch dạng .msg\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2299,22 +2298,22 @@ msgstr ""
 "Hai tùy ch�n “-l� và “-d� bắt buộc phải sử dụng.\n"
 "Tập tin dạng .msg được ghi trong thư mục đã cho.\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "Các tùy ch�n dành cho chế độ Desktop Entry:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=MẪU              tập tin .desktop được dùng làm mẫu\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d THƯ_MỤC                  thư mục cơ sở của tập tin .po\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2323,7 +2322,7 @@ msgstr ""
 "  -kTỪ, --keyword=TỪ          quét tìm TỪ này như là một từ khóa bổ sung\n"
 "  -k, --keyword               không dùng từ khóa mặc định\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2334,27 +2333,27 @@ msgstr ""
 "tin\n"
 "đầu vào sẽ đ�c từ thư mục thay cho đối số dòng lệnh.\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr "Các tùy ch�n XML:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr "  -L, --language=TÊN          thừ nhận ngôn ngữ XML đã cho\n"
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=MẪU              một tập tin XML được dùng làm mẫu\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Giải thích tập tin đầu vào:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2366,14 +2365,14 @@ msgstr ""
 "                                   --check-header (kiểm tra phần đầu)\n"
 "                                   --check-domain (kiểm tra mi�n)\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          kiểm tra các chuỗi có định dạng\n"
 "                              phụ thuộc vào ngôn ngữ\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2381,7 +2380,7 @@ msgid ""
 msgstr ""
 "      --check-header          kiểm tra xem mục tin phần đầu có đúng không\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2390,7 +2389,7 @@ msgstr ""
 "      --check-domain          kiểm tra nếu có sự xung đột giữa chỉ thị mi�n\n"
 "                              và tùy ch�n “--output-file� (tập tin xuất)\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2399,7 +2398,7 @@ msgstr ""
 "  -C, --check-compatibility   kiểm tra msgfmt của GNU ứng xử\n"
 "                              giống như msgfmt của X/Open\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2409,12 +2408,12 @@ msgstr ""
 "      --check-accelerators[=K.TỰ] kiểm tra có ký tự tăng tốc bàn phím\n"
 "                              cho mục trình đơn\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             dùng mục tin tạm dịch trong kết xuất\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
@@ -2422,7 +2421,7 @@ msgstr ""
 "  -a, --alignment=S�          căn chỉnh các chuỗi theo số byte này (mặc "
 "định: %d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2436,91 +2435,91 @@ msgstr ""
 "                                (byte đứng trước là lớn hay nh�. Intel "
 "thư�ng là little)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               tập tin nhị phân sẽ không chứa bảng băm\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            in ra thống kê v� các chuỗi dịch\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               gia tăng mức chi tiết\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "cảnh báo: phần đầu của tập tin .po còn thiếu hay không hợp lệ\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "cảnh báo: việc chuyển đổi bộ ký tự sẽ không hoạt động được\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "cảnh báo: phần đầu tập tin PO thiếu thông tin\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "cảnh báo: phiên bản msgfmt cũ hơn sẽ thông báo lỗi trong trư�ng hợp này.\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "tên mi�n “%s� không thích hợp làm tên tập tin"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "tên mi�n “%s� không thích hợp làm tên tập tin: nên sẽ dùng ti�n tố"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "chỉ thị “domain %s� bị b� qua"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "mục tin “msgstr� rỗng bị b� qua"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "chuỗi “msgstr� tạm dịch bị b� qua"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: cảnh báo: tập tin nguồn chứa chuỗi tạm dịch"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s không tồn tại"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "có %s nhưng không thể đ�c nó"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "gặp lỗi khi đ�c “%s�"
@@ -2772,12 +2771,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Bản dịch Tiếng Việt dành cho gói %s"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "bộ ký tự hiện có “%s� không phải tên bộ ký tự khả chuyển"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "tập tin đầu vào chứa hai bộ ký tự khác nhau “%s� và “%s�"
@@ -2796,14 +2795,14 @@ msgid ""
 msgstr ""
 "mi�n “%s� trong tập tin đầu vào “%s� không chứa trư�ng xác định bộ ký tự"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "bộ ký tự đích “%s� không phải tên bảng mã khả chuyển."
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "cảnh báo: "
@@ -2898,24 +2897,24 @@ msgstr ""
 "Kết xuất của “%s� có thể không đúng.\n"
 "Cách giải quyết có thể là đặt “LC_ALL=C�\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "dạng thức số nhi�u có thể cung cấp giá trị âm"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "“nplurals = %lu� nhưng dạng thức số nhi�u có thể tạo giá trị đến %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "dạng thức số nhi�u có thể gây ra trư�ng hợp chia cho số không"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "dạng thức số nhi�u có thể gây ra trư�ng hợp tràn số nguyên"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2923,54 +2922,54 @@ msgstr ""
 "dạng thức số nhi�u có thể gây ra trư�ng hợp ngoại lệ tính toán, có lẽ chia "
 "cho số không"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Hãy thử dùng đi�u theo đây mà hợp lệ cho %s:"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "catalog bản dịch chứa bản dịch dạng số nhi�u"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 "nhưng mà mục tin phần đầu tập tin còn thiếu thuộc tính số nhi�u "
 "“plural=BIỂU_THỨC�"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 "nhưng mà mục tin phần đầu tập tin còn thiếu thuộc tính số nhi�u "
 "“plural=S�_NGUYÊN�"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "giá trị nplurals (số dạng số nhi�u) không hợp lệ"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "dạng thức số nhi�u không hợp lệ"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "nhưng một số chuỗi chỉ có %lu dạng số nhi�u"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "nhưng một số chuỗi có %lu dạng số nhi�u"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2981,93 +2980,98 @@ msgstr ""
 "Với tiếng Việt, bạn có thể dùng:\n"
 "\"Plural-Forms: nplurals=1; plural=0;\""
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "cả hai mục tin “msgid� và “msgid_plural� đ�u không bắt đầu với “\\n�"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "cả hai mục tin “msgid� và “msgstr[%u]� đ�u không bắt đầu với “\\n�"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "cả hai mục tin “msgid� và “msgstr� đ�u không bắt đầu với “\\n�"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "cả hai mục tin “msgid� và “msgid_plural� đ�u không kết thúc với “\\n�"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "cả hai mục tin “msgid� và “msgstr[%u]� đ�u không kết thúc với “\\n�"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "cả hai mục tin “msgid� và “msgstr� đ�u không kết thúc với “\\n�"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 "khả năng xử lý dạng thức số nhi�u là một phần mở rộng của phần m�m gettext "
 "của GNU"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "chuỗi dịch msgstr còn thiếu ký tự gia tốc “%c�"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "chuỗi dịch msgstr có quá nhi�u ký tự gia tốc “%c�"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "trư�ng “%s� ở phần đầu vẫn có giá trị khởi tạo mặc định\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "trư�ng “%s� còn thiếu trong phần đầu\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "chấm lửng hóa ('...') thay cho Unicode"
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 "tìm thấy khoảng trắng trước phần chấm lửng trong các chuỗi ngư�i dùng khả "
 "kiến"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "Trích dẫn dấu nháy kép ASCII thay cho Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "Trích dẫn dấu nháy đơn ASCII thay cho Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "Chấm ASCII (“%c�) thay cho Unicode"
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: đầu vào ở bảng mã ký tự “%s� không hợp lệ"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: gặp lỗi khi chuyển đổi từ bảng mã ký tự “%s� sang bảng mã ký tự “%s�"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "tập tin đầu vào không chứa mục tin phần đầu xác định bộ ký tự"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -3076,7 +3080,7 @@ msgstr ""
 "Không thể chuyển đổi từ “%s� sang “%s�. %s phụ thuộc vào iconv() mà không hỗ "
 "trợ khả năng chuyển đổi này."
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -3085,8 +3089,8 @@ msgstr ""
 "Việc chuyển đổi từ “%s� sang “%s� giới thiệu một số bản sao: một số chuỗi "
 "gốc “msgid� thì trở thành trùng."
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3533,7 +3537,7 @@ msgstr "kết thúc dòng bên trong chuỗi"
 msgid "context separator <EOT> within string"
 msgstr "gặp dấu định giới ngữ cảnh <EOT> bên trong chuỗi"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tập tin này có thể không chứa chỉ thị mi�n"
@@ -3554,31 +3558,31 @@ msgstr "tên nhóm chưa được chấm dứt"
 msgid "invalid non-blank character"
 msgstr "ký tự không phải khoảng trắng không hợp lệ"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, c-format
 msgid "missing '=' after \"%s\""
 msgstr "thiếu “=� sau \"%s\""
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 msgid "invalid non-blank line"
 msgstr "dòng không trắng không hợp lệ"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "tập tin “%s� bị cắt ngắn"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "tập tin “%s� chứa một chuỗi không phải được kết thúc bằng NUL"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "tập tin “%s� không phải có định dạng .mo của GNU"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "tập tin “%s� chứa một chuỗi không được kết thúc bằng NUL, tại %s"
@@ -3762,25 +3766,25 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr "gặp lỗi khi biên dịch lớp C#"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "gặp lỗi khi mở “%s� để ghi"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "không phải tên lớp Java hợp lệ: %s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "lỗi biên dịch lớp Java, hãy thử tùy ch�n “--verbose� (xuất chi tiết) hoặc "
 "đặt biến $JAVAC"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "lỗi biên dịch lớp Java, hãy thử đặt biến $JAVAC"
@@ -3894,12 +3898,12 @@ msgstr ""
 "còn định dạng kiểu Tcl không hỗ trợ khả năng thao tác\n"
 "dạng thức số nhi�u.\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: cảnh báo: chuỗi chưa được kết thúc"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: cảnh báo: biểu thức chính quy chưa được kết thúc"
@@ -3919,7 +3923,7 @@ msgstr "%s:%d: cảnh báo: hằng ký tự chưa được kết thúc"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: cảnh báo: kiểu chuỗi văn chưa được kết thúc"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "Hãy đưa ra bảng mã ký tự nguồn bằng tùy ch�n “--from-code� (từ mã)."
 
@@ -3959,7 +3963,7 @@ msgstr ""
 "%s:%d: chuỗi đa byte chưa hoàn thành ở kết thúc dòng.\n"
 "Hãy đưa ra bảng mã ký tự nguồn đúng bằng “--from-code� (từ mã).\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: lá»—i iconv"
@@ -3973,7 +3977,7 @@ msgstr ""
 "%s:%d: chuỗi đa byte không hợp lệ.\n"
 "Hãy đưa ra bảng mã ký tự nguồn dùng “--from-code� (từ mã).\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: cảnh báo: ký tự Unicode không hợp lệ"
@@ -3995,39 +3999,39 @@ msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 "%s:%d: cảnh báo: gặp dấu ngoặc móc đóng “}� ở nơi cần dấu ngoặc đóng “)�"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "“%s� không phải là tên bảng mã. Quay lại dùng ASCII.\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "không nhận kiểm tra “%s�"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "không biết kiểu kết thúc câu “%s�"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "không cho phép dùng tùy ch�n “--join-existing� (nối lại tồn tại) khi kết "
 "xuất được ghi vào đầu ra tiêu chuẩn"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "phần m�m xgettext không thể hoạt động khi không có từ khóa cần tìm"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr "cảnh báo: tập tin quy tắc ITS “%s� không tồn tại"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
@@ -4035,17 +4039,17 @@ msgstr ""
 "cảnh báo: tập tin quy tắc ITS “%s� không tồn tại; kiểm tra bản cài đặt "
 "gettext của bạn"
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "cảnh báo: không biết tập tin “%s� có phần mở rộng “%s�; nên thử C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Trích các chuỗi có thể dịch ra những tập tin đầu vào đã cho.\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4054,24 +4058,24 @@ msgstr ""
 "  -d, --default-domain=TÊN    dùng tập tin TÊN này làm kết xuất\n"
 "                              (thay cho messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=TẬP_TIN        ghi kết xuất vào tập tin này\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=THƯ_MỤC    các tập tin xuất sẽ được để vào thư mục này\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Ch�n ngôn ngữ của tập tin đầu vào:\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -4092,12 +4096,12 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   dạng viết tắt của “--language=C++�\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4106,7 +4110,7 @@ msgstr ""
 "Mặc định là ngôn ngữ sẽ được đoán phụ bằng phần mở rộng của tên tập tin đầu "
 "vào.\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4115,24 +4119,24 @@ msgstr ""
 "      --from-code=MÃ         bảng mã ký tự của tập tin đầu vào\n"
 "                                (trừ Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Mặc định là giả sử tập tin đầu vào có bộ ký tự ASCII.\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         nối lại các chuỗi với tập tin đã có\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=TẬP_TIN.po mục tin từ tập tin này sẽ không được trích "
 "ra\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4147,18 +4151,18 @@ msgstr ""
 "  -c, --add-comments          để vào tập tin kết xuất các khối ghi chú nằm\n"
 "                                trước dòng từ khóa\n"
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=TÊN             thực hiện kiểm tra cú pháp trên chuỗi\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -4169,17 +4173,17 @@ msgstr ""
 "                                (single-space, đây là mặc định,\n"
 "                                 hoặc double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Tùy ch�n đặc trưng cho ngôn ngữ:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           trích ra m�i chuỗi\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4194,7 +4198,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4209,7 +4213,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4219,7 +4223,7 @@ msgstr ""
 "      --flag=TỪ:��I_S�:CỜ     c� phụ thêm cho chuỗi nằm bên trong đối số\n"
 "                              có số ��I S� của từ khóa TỪ\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4234,38 +4238,48 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             hiểu chữ ba C kiểu ANSI để nhập vào\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (chỉ những ngôn ngữ C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "      --its=TẬP_TIN           áp dụng các quy tắc ITS từ TẬP_TIN\n"
+
+#: src/xgettext.c:1145
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (chỉ ngôn ngữ dựa trên XML)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    chấp nhận chuỗi định dạng Qt\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (chỉ ngôn ngữ C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   chấp nhận chuỗi định dạng KDE4\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 chấp nhận chuỗi định dạng Boost\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4273,30 +4287,25 @@ msgstr ""
 "      --debug                 kết quả chi tiết hơn v� nhận diện định dạng "
 "chuá»—i\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output      ghi ra tập tin .properties\n"
 "                               thuộc tính) kiểu Java\n"
 
-#: src/xgettext.c:1196
-#, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "      --its=TẬP_TIN           áp dụng các quy tắc ITS từ TẬP_TIN\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --itstool               ghi ra các ghi chú itstool\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=CHUỖI  đặt ngư�i giữ tác quy�n trong kết xuất\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4304,18 +4313,18 @@ msgstr ""
 "      --foreign-user          b� phần bản quy�n Tổ Chức Phần M�m Tự Do\n"
 "                              trong kết xuất cho ngư�i dùng nước ngoài\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=GÓI      đặt tên gói trong kết xuất\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=PHIÊN_BẢN đặt phiên bản của gói trong kết xuất\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4323,7 +4332,7 @@ msgstr ""
 "      --msgid-bugs-address=�ỊA_CHỈ@THƯ\n"
 "                              đặt địa chỉ thông báo lỗi chuỗi gốc msgid\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4333,7 +4342,7 @@ msgstr ""
 "  -m[CHUỖI], --msgstr-prefix[=CHUỖI]    dùng CHUỖI này hay \"\"\n"
 "                              làm ti�n tố cho giá trị msgstr\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4343,7 +4352,7 @@ msgstr ""
 "  -M[CHUỖI],  --msgstr-suffix[=CHUỖI]   dùng chuỗi này hay \"\" làm hậu tố\n"
 "                                        cho giá trị msgstr\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4351,31 +4360,31 @@ msgid ""
 msgstr ""
 "�ối số “--flag� (c�) không có cú pháp <từ khóa>:<số đối số>:[qua-]<c�>: %s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "đầu vào tiêu chuẩn"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Gặp một ký tự không phải ASCII tại %s%s."
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Gặp một ghi chú không phải ASCII nằm tại hay trước %s%s."
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Gặp một chuỗi không phải ASCII tại %s%s."
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: cảnh báo: "
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4384,7 +4393,7 @@ msgstr ""
 "Dù nó được dùng tại một vị trí của chuỗi định dạng, %s không phải là một "
 "chuỗi định dạng %s đúng. Lý do: %s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4393,7 +4402,7 @@ msgstr ""
 "Dù nó được khai báo như vậy, %s không phải là một chuỗi định dạng %s đúng. "
 "Lý do: %s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4407,7 +4416,7 @@ msgstr ""
 "�� nghị bạn dùng chuỗi định dạng có đối số có tên,\n"
 "và sự ánh xạ thay cho bản ghi nhi�u thành phần cho những đối số.\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4418,28 +4427,28 @@ msgstr ""
 "gettext(\"\") sẽ đưa ra siêu thông tin (thông tin đặc biệt),\n"
 "không phải chuỗi trống rỗng.\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "đặc tả đối chưa rõ ràng cho từ khóa “%.*s�"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "cảnh báo: thiếu ngữ cảnh cho từ khóa “%.*s�"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "cảnh báo: thiếu ngữ cảnh cho đối số ở dạng thức số nhi�u của từ khóa “%.*s�"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ngữ cảnh xung đột giữa dạng số ít và số nhi�u"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4451,7 +4460,7 @@ msgstr ""
 "hãy chỉ định biến MSGID_BUGS_ADDRESS trong đó;\n"
 "không thì đưa ra tùy ch�n dòng lệnh “--msgid-bugs-address�.\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "không nhận ra ngôn ngữ “%s�"
@@ -4566,7 +4575,7 @@ msgstr "%s:%d: phép nội suy không hợp lệ (\"\\L\") của ký tự 8-bit
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: phép nội suy không hợp lệ (\"\\U\") của ký tự 8-bit “%c�"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4575,7 +4584,7 @@ msgstr ""
 "hoặc bằng ghi chú như được ghi rõ trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4587,7 +4596,7 @@ msgstr ""
 "hoặc bằng ghi chú như được chỉ ra trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4599,7 +4608,7 @@ msgstr ""
 "hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4611,7 +4620,7 @@ msgstr ""
 "hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4623,7 +4632,7 @@ msgstr ""
 "hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4635,22 +4644,22 @@ msgstr ""
 "hoặc thông qua ghi chú như được định nghĩa trong tài liệu\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Không nhận ra bảng mã ký tự “%s� nên tiếp tục với ASCII để thay thế."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: chuỗi gốc không hợp lệ"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: thiếu con số nằm sau dấu #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: dạng thức chuỗi không hợp lệ"
diff --git a/gettext-tools/po/zh_CN.gmo b/gettext-tools/po/zh_CN.gmo
index 5e0d39d..4a40042 100644
--- a/gettext-tools/po/zh_CN.gmo
+++ b/gettext-tools/po/zh_CN.gmo
diff --git a/gettext-tools/po/zh_CN.po b/gettext-tools/po/zh_CN.po
index f4c3055..b3d4013 100644
--- a/gettext-tools/po/zh_CN.po
+++ b/gettext-tools/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.19.4.73\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2015-09-01 16:16中国标准时间\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -108,7 +108,7 @@ msgid "Unknown system error"
 msgstr "未知的系统错误"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -186,15 +186,15 @@ msgstr "compile_java_class 中有无效的 source_version �数"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class 中有无效的 target_version �数"
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "创建“%s�失败"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -217,39 +217,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s �进程 I/O 错误"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr "线程创建失败"
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "写入 %s �进程失败"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "由 %s �进程读入数�时出现错误"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "无法为 %s �进程创建�专用的 I/O"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "和 %s �进程通讯时出现错误"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s �进程已终止，错误�为 %d"
@@ -288,18 +288,18 @@ msgstr "�"
 msgid "setting permissions for %s"
 msgstr "设置 %s 的��"
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "无法创建管�"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失败"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "无法还原文件�述符 %d: dup2 错误"
@@ -331,11 +331,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "试试“%s --help�查看帮助信�。\n"
@@ -355,7 +355,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -370,21 +370,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  显示此帮助并退出\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  显示此帮助并退出\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               输出版本信�并退出\n"
@@ -394,20 +394,20 @@ msgstr "  -V, --version               输出版本信�并退出\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -421,10 +421,10 @@ msgstr ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 编写。\n"
@@ -455,37 +455,37 @@ msgid "extra operand %s"
 msgstr ""
 
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "打开“%s�读�时出错"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "�数\"%u\"(如�\"%s\")的格�指定在\"%s\"中�存在"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "�数 %u 的格�指定符在“%s�中�存在"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -521,8 +521,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "字符串引用了第 %u 个�数但是�忽略了第 %u 个�数。"
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "“%s�和“%s�中的指定格�数��匹�"
@@ -810,8 +809,8 @@ msgstr "“%s�和“%s�中的格�指定符��"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "“%s�中的格�指定符�是“%s�格�指定符的�集"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "�数“%s�的格�指定符未在“%s�中找到"
@@ -828,57 +827,57 @@ msgstr "第 %u �指令中，大�指定符与转�指定符“%c��兼容
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "第 %u �指令中，“%c���以field name 开始。"
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "第 %u �指令中，“%c���以getattr �数开始。"
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "第 %u �指令中，“%c���以getitem �数开始。"
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "第 %u �指令中，格�定义中��许过多嵌套。"
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "第 %u �指令中，格�指令中无终止符。"
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr "字符串�时使用两�方�引用了�数：通过�数�称和未命��数指定符。"
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "字符串对�为“%s�的�数引用方��兼容。"
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "“%s�中的格�指定符需�映射，而“%s�中的格�指定符需�元组"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "“%s�中的格�指定符需�元组，而“%s�中的格�指定符需�映射"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "�数\"%s\"(如�\"%s\")的格�指定在\"%s\"中�存在"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -928,7 +927,7 @@ msgid ""
 msgstr "终止第 %u �指令的字符�是介于 1 和 9 之间的数字。"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -973,11 +972,11 @@ msgstr "  -f, --fqdn, --long          长主机�，包括全称域�和别�
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主机�地�\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "信�性输出：\n"
@@ -1049,12 +1048,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "�许最多一个输入文件"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 互相排斥"
@@ -1071,7 +1070,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr "根�消�的属性过滤一个翻译库里的消�，并处�消�的属性。\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1080,10 +1079,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "长选项必须用的�数在使用短选项时也是必须的。\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "输入文件的�置：\n"
@@ -1093,10 +1092,10 @@ msgstr "输入文件的�置：\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  输入文件                    �为输入的 PO 文件\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1108,23 +1107,23 @@ msgstr "  -D, --directory=目录        在<目录>中查找输入文件\n"
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果没有指定输入文件或输入文件是 -，则读�标准输入。\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "输出文件�置：\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=文件      将输出写入指定文件\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1133,7 +1132,7 @@ msgid ""
 "or if it is -.\n"
 msgstr "如果没有指定输出文件或输出文件是 -，则将结果写入至标准输出。\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "消�选择：\n"
@@ -1240,9 +1239,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等于 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1264,17 +1263,17 @@ msgid ""
 msgstr ""
 "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "输出细节：\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1287,119 +1286,119 @@ msgstr ""
 "                              WHEN �以"
 "是‘always’，‘never’，‘auto’或‘html’。\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=STYLEFILE       为 --color �数指定 CSS 样�文件\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             �在输出中使用 C 转��列(默认)\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr "  -E, --escape                在输出中使用 C 转��列，没有扩展字符\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算为空也写入 PO 文件\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                使用缩进风格写入 .po 文件\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           �写入“#: 文件�:行���置行\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr "  -n, --add-location          生�“#: 文件�:行���置行(默认)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                写入�为严格的 Uniforum 使 .po 文件��一致\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     写出 Java .properties 文件\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    写出 NeXTstep/GNUstep .strings 文件\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=数字            设置输出页�宽度\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr "      --no-wrap               �将超过输出页宽度的长消�行断为多行\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           输出�排�\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          按文件�置排�输出\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "��能出现的选择�件 (%d < n < %d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [选项] [输入文件]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1422,23 +1421,23 @@ msgstr ""
 "翻译内容�自行加上的批注和�程�代�批注，以�文件中的�置等都会累积，\n"
 "除�使用了 --use-first选项，那样则会由第一个包�该翻译�目的文件获�数�。\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  输入文件 ...                输入文件\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=文件       由<文件>读入输入文件的列表\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果输入文件为 -，则将读�标准输入。\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1447,7 +1446,7 @@ msgstr ""
 "  -<, --less-than=数字        �打�出现次数少于指定次数的消�，若没有\n"
 "                              指定次数则默认值为无穷大\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1456,7 +1455,7 @@ msgstr ""
 "  ->, --more-than=数字        �打�出现次数多于指定次数的消�，若没有\n"
 "                              指定次数则默认值为 0\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1465,14 +1464,14 @@ msgstr ""
 "  -u, --unique                --less-than=2 的缩写，�求�列出出现一次\n"
 "                              的消�\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1481,12 +1480,12 @@ msgid ""
 msgstr ""
 "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=�称          输出的编�\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1495,14 +1494,14 @@ msgstr ""
 "      --use-first             对��消��使用第一个�用的翻译，��并若干\n"
 "                              �翻译\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr "      --lang=CATALOGNAME      在文件头中设定 'Language'\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
@@ -1604,18 +1603,18 @@ msgstr "此消�已使用，但未定义于 %s 中"
 msgid "warning: this message is not used"
 msgstr "警告：此消�未使用"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "�现 %d 处致命错误"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "需�至少指定两个文件"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1635,7 +1634,7 @@ msgstr ""
 "但�会�留最先定义这些信�的 PO 文件中的内容。\n"
 "所有 PO 文件中的翻译�目的文件�置都会累积下�。\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1644,7 +1643,7 @@ msgstr ""
 "  ->, --more-than=数字        �打�出现次数多于指定次数的消�，若没有\n"
 "                              指定次数则默认值为 1\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1689,7 +1688,7 @@ msgstr "  -n, --add-location          �留“#: filename:line�行(默认)\n"
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                严格的 Uniforum 输出风格\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "没有给出输入文件"
@@ -1866,121 +1865,121 @@ msgstr "      --keep-header           ��文件头项��，�过滤它\n"
 msgid "filter output is not terminated with a newline"
 msgstr "filter 输出未以�行符终止"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的�数应该是一个标点符�"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "无效的 endianness：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "若指定了%s 和%s，则无需指定输入文件"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需�指定“-d 目录�选项"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需�指定“-l locale�选项"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s 需�指定“--template template�选项"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s 需�指定“-o file�选项"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "在%3$s 中%1$s 和 %2$s 互斥"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s �能�� %s 或 %s 一起使用�有效"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s �能�� %s�%s 或 %s 一起使用�有效"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "无法创建输出文件“%s�"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d �已翻译消�"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，%d �模糊消�"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，%d �未翻译消�"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [选项] filename.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模��述生�二进制消�文件。\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  文件�.po ...               输入文件\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "�作模�：\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr "  -j, --java                  Java 模�：生� Java 资�包类\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1989,62 +1988,62 @@ msgstr ""
 "      --java2                 类似 --java，但�设是 Java2 (JDK 1.2 或较新\n"
 "                              的版本)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模�：生� .NET .dll 文件\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr "      --csharp-resources      C# 资�模�：生� .NET .resources 文件\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模�：生� tcl/msgcat .msg 文件\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模�：生� Qt .qm 文件\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --desktop               桌�访问模�: 生� .desktop 文件\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    Qt 模�：生� Qt .qm 文件\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                使用严格的 Uniforum 模�\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果输出文件是 -，则会将结果写入至标准输出。\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "以 Java 模�输出文件�置：\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=资�         资��称\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2052,20 +2051,20 @@ msgid ""
 msgstr ""
 "  -l, --locale=语系           语系�称，必须是“语言�或“语言_国家�的格�\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
 "file\n"
 msgstr "      --source                生� .java 文件，而� .class 文件\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目录                     类目录层次的基本目录\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2076,19 +2075,19 @@ msgstr ""
 "类�称是由资��称连�语系�称共�决定的，两者之间会用下划线分隔。\n"
 "-d 选项是必须的。class 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "以 C# 模�输出文件�置：\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr "  -d 目录                     �赖语系的 .dll 文件的的基本目录\n"
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2097,39 +2096,39 @@ msgstr ""
 "-l 和 -d 选项是必�的。.dll 文件会写入指定目录的�目录，而�目录的�称�决于"
 "语系。\n"
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "以 Tcl 模�输出文件�置：\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  -d DIRECTORY                    .msg 消�库的基本目录\n"
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr "-l 和 -d 选项是必�的。所生�的 .msg 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr "桌�访问模�选项:\n"
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr "  --template=TEMPLATE         .desktop 文件用作模版\n"
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d DIRECTORY                    .po文件的基本目录\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2138,7 +2137,7 @@ msgstr ""
 "  -kWORD, --keyword=WORD      查找 WORD 作为一个�外的关键字\n"
 "  -k, --keyword               �使用默认关键字\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2148,27 +2147,27 @@ msgstr ""
 "-l，-o �--temmplate 选项是必须的。若指定了-D，\n"
 "则输入文件从目录读�，而�命令行�数。\n"
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, fuzzy, c-format
 msgid "XML mode options:\n"
 msgstr "桌�访问模�选项:\n"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, fuzzy, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr "  --template=TEMPLATE         .desktop 文件用作模版\n"
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "输入文件的处�:\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2178,19 +2177,19 @@ msgstr ""
 "  -c, --check                 �时进行 --check-format�--check-header 和\n"
 "                                --check-domain 三�检查\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          检查和语言有关的格�字符串\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          检查文件头项是�存在�检查其内容\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2199,7 +2198,7 @@ msgstr ""
 "      --check-domain          检查 domain 指令和 --output-file 选项之间\n"
 "                                是�冲�\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2207,7 +2206,7 @@ msgid ""
 msgstr ""
 "  -C, --check-compatibility   让 GNU msgfmt 以 X/Open msgfmt 的方�检查文件\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2216,19 +2215,19 @@ msgid ""
 msgstr ""
 "      --check-accelerators[=CHAR]  检查��项目中的快�键标记是�存在\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在输出中使用模糊的翻译�目\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=数字        以<数字>个字节为��对�字符串(默认：%d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2239,89 +2238,89 @@ msgstr ""
 "      --endianness=BYTEORDER  以指定字节�输出 32�数\n"
 "                                (big 还是 little 是系统平�默认的)\n"
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               二进制文件将�包�哈希表\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            打�关于翻译的统计\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               增加输出的详细程度\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：PO 文件头丢失或无效\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字符集转�无法工作\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 文件头模糊\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "警告：旧版本的 msgfmt 将在此时给出错误\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "域�“%s�无法用于文件�"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "域�“%s�无法用于文件�：将使用�缀"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "忽略了“domain %s�命令"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "忽略了空的“msgstr�项"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "忽略了模糊的“msgstr�项"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：�文件包�模糊的翻译�目"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr "%s �存在"
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s 存在但��读"
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "读�“%s�出错"
@@ -2550,12 +2549,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s 软件包的简体中文翻译"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "当�的字符集编�“%s��是通用的编��称"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "输入文件中出现了两���的字符集“%s�和“%s�"
@@ -2573,14 +2572,14 @@ msgid ""
 "charset specification"
 msgstr "输入文件“%2$s�的域“%1$s��包�指定字符集的文件头项"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "目标字符集编�“%s��是通用的编��称。"
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2668,72 +2667,72 @@ msgstr ""
 "“%s�的输出�能有误。\n"
 "设置 LC_ALL=C 是一个�行的解决方法。\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "�数表达�将导致负值"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu，但�数表达�的最大值�能等于 %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "�数表达�将导致被零除"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "�数表达�将引起整数溢出"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "�数表达�将引起算术异常，�能被零除"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "请�试使用下�的，对 %s 是有效的："
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 msgid "message catalog has plural form translations"
 msgstr "消�库有�数形�的翻译"
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "但是文件头项中缺少“plural=表达��属性"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "但是文件头项中缺少“nplural=整数�属性"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "nplurals 值无效"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "plural 表达�无效"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "但是�些消��有 %lu ��数形�"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "但是�些消�有 %lu ��数形�"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2741,103 +2740,108 @@ msgstr ""
 "翻译库包��数形�的翻译，但缺少以下的文件头项：\n"
 "“Plural-Forms: nplurals=<整数>; plural=<表达�>;�"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "“msgid�和“msgid_plural�项并�都以“\\n�开始"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "“msgid�和“msgstr[%u]�项并�都以“\\n�开始"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "“msgid�和“msgstr�项并�都以“\\n�开始"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "“msgid�和“msgid_plural�项并�都以“\\n�结�"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "“msgid�和“msgstr[%u]�项并�都以“\\n�结�"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "“msgid�和“msgstr�项并�都以“\\n�结�"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "�数处�是 GNU gettext 的扩展功能"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少快�键标记“%c�"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 包�过多的快�键标记“%c�"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "文件头“%s��然是默认值未改�\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "头部缺少文件头“%s�\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr "ASCII �略�('...')代替了Unicode "
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr "在用户��字符串中的�略���现了空格"
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr "ASCII �引�代替了Unicode"
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr "ASCII �引�代替了Unicode"
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, fuzzy, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr "ASCII �略�('...')代替了Unicode "
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s：在“%s�编�中输入无效"
 
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s：从“%s�编�转�到“%s�编�时出错"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "输入文件�包�指定字符集的文件头项"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr "无法从“%s�转�为“%s�。%s 需� iconv()，但 iconv() �支�此�转�方�。"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr "从“%s�转�为“%s�出现了��项：�些原本��的 msgid ��了相�项。"
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3244,7 +3248,7 @@ msgstr "字符串内�到行尾"
 msgid "context separator <EOT> within string"
 msgstr "上下文分隔符 <EOT> 出现于字符串中"
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此文件�能�包�域指令"
@@ -3266,32 +3270,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr "警告：无效的 Unicode 字符"
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "缺少过滤器�称"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "nplurals 值无效"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "文件“%s�被截断"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "文件“%s�包�� NUL 结�的字符串"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "文件“%s��是 GNU .mo 格�"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "文件“%s�包�� NUL 结尾的字符串，�于 %s"
@@ -3461,23 +3465,23 @@ msgstr "编译 C# 类失败，试试 --verbose"
 msgid "compilation of C# class failed"
 msgstr "编译 C# 类失败"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "打开“%s�写入出错"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "�是有效的 Java 类�：%s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "编译 Java 类失败，试试 --verbose 或设置 $JAVAC ��"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "编译 Java 类失败，请�试设置 $JAVAC ��"
@@ -3583,12 +3587,12 @@ msgstr ""
 "消�库有�数翻译\n"
 "但是 Tcl 消�库�支��数处�\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d：警告：未结�的字符串"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d：警告：未结�的正规表达�"
@@ -3608,7 +3612,7 @@ msgstr "%s:%d：警告：未结�的字符常�"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d：警告：未结�的字符串字�"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 msgid "Please specify the source encoding through --from-code."
 msgstr "请用 --from-code 指定�编�"
 
@@ -3648,7 +3652,7 @@ msgstr ""
 "%s:%d：文件结尾处出现了�完整的多字节�列。\n"
 "请通过 --from-code 指定�文件的编�。\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d：iconv 失败"
@@ -3662,7 +3666,7 @@ msgstr ""
 "%s:%d：无效的多字节�列。\n"
 "请通过 --from-code 指定�文件的编�。\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d：警告：无效的 Unicode 字符"
@@ -3682,76 +3686,76 @@ msgstr "%s:%d：警告：期待“}���现了“)�"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d：警告：期待“)���现了“}�"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr "“%s��是个有效的编��。正使用ASCII 作为替�。\n"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, c-format
 msgid "syntax check '%s' unknown"
 msgstr "语法检查“%s�未知"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr "��结尾类型“%s�未知"
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "输出写到 stdout 时无法使用 --join-existing"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "没有指定关键字 xgettext 将无法工作"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "警告：文件“%s�扩展�“%s�未知; 将试试 C"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "从给定的输入文件中���翻译的字符串。\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr "  -d, --default-domain=�称   使用<�称.po>输出(而�是 messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=文件           将输出写入指定文件\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=目录       输出文件将会存放在<目录>中\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "选择输入文件所用的语言：\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3772,19 +3776,19 @@ msgstr ""
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的简写\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "默认情况下，所使用的语言是根�输入文件的扩展�猜测的。\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3793,22 +3797,22 @@ msgstr ""
 "      --from-code=�称        输入文件的编�\n"
 "                                (除了 Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "默认情况下，输入文件都认为是纯 ASCII 文件。\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         将消�加入已有文件\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=文件.po  文件.po中的项���\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3822,19 +3826,19 @@ msgstr ""
 "  -c, --add-comments          在输出文件中以关键�开�一行，\n"
 "                              并放置所有注释�\n"
 
-#: src/xgettext.c:1117
-#, c-format
+#: src/xgettext.c:1105
+#, fuzzy, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 "      --check=NAME            对信�文本�语法检查\n"
 "                                (Unicode�略�ellipsis-unicode, 空格加�略�"
 "space-ellipsis,\n"
 "                                 Unicode引�quote-unicode)\n"
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3845,17 +3849,17 @@ msgstr ""
 "                                (默认�空格single-space \n"
 "                                 或�空格double-space)\n"
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "语言特定选项:\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ��所有字符串\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3870,7 +3874,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3885,7 +3889,7 @@ msgstr ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
 "                                Lua, JavaScript, Vala, Desktop)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3895,7 +3899,7 @@ msgstr ""
 "      --flag=WORD:ARG:FLAG    在关键字WORD 的�数个数ARG 中\n"
 "                              字符串的�外flag\n"
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3910,85 +3914,90 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
 "                                Lua, JavaScript, Vala)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             �解输入时的 ANSI C 分段\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (仅支� C, C++, ObjectiveC 语言)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "  -f, --files-from=文件       由<文件>读入输入文件的列表\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (仅 C++ 语言)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    识别 Qt 格�字符串\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (仅 C++ 语言)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   识别 KDE 4 格�字符串\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 识别 Boost 格�字符串\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 更详细的格�字符串识别结果\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     写出 Java .properties 文件\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "  -f, --files-from=文件       由<文件>读入输入文件的列表\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --indent                缩进的输出风格\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=字符串  在输出中设置版���符\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr "      --foreign-user          为外语用户�略 FSF 版�\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  输出时设定软件包�字\n"
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  输出时设定软件包版本\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  设置报告 msgid 错误的地�\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3998,7 +4007,7 @@ msgstr ""
 "  -m[STRING], --msgstr-prefix[=STRING]  使用 STRING 或 \"\" 作为\n"
 "                                         msgstr 内容的�缀\n"
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4008,38 +4017,38 @@ msgstr ""
 "  -M[STRING], --msgstr-suffix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的�"
 "ç¼€\n"
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr "--flag �数并�以 <关键字>:<�数编�>:[�数-]<标志> 的语法给出：%s"
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "标准输入"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s 处有� ASCII �字符。"
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s 处或之��置有� ASCII �注释。"
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s 处有� ASCII 字符串。"
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s：警告："
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4047,14 +4056,14 @@ msgid ""
 msgstr ""
 "尽管在格�字符串的�置使用，但 %s ��是有效的 %s 格�字符串。原因：%s\n"
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr "以所声明的语言 %2$s �看，%1$s �是有效的格�字符串。原因：%3$s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4066,7 +4075,7 @@ msgstr ""
 "翻译者无法�新编排�数的顺�。\n"
 "请考虑使用带有命��数和映射的格�字符串，而�是使用�数数组。\n"
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4076,27 +4085,27 @@ msgstr ""
 "gettext(\"\") 将返回文件头项，而�\n"
 "是空字符串。\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "关键字“%.*s�的�数指定�糊"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "警告：关键字“%.*s�缺少上下文"
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "警告：关键字“%.*s�缺少�数�数上下文"
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "�数和�数的上下文�匹�"
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4108,7 +4117,7 @@ msgstr ""
 " MSGID_BUGS_ADDRESS ��；\n"
 "�则，请指定 --msgid-bugs-address 命令行选项。\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, c-format
 msgid "language '%s' unknown"
 msgstr "语言“%s�未知"
@@ -4217,7 +4226,7 @@ msgstr "%s:%d：8�字符“%c�转义无效(“\\L�)"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d：8�字符“%c�转义无效(“\\U�)"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
@@ -4225,7 +4234,7 @@ msgstr ""
 "请通过 --from-code 或是注释指定�文件的编�，\n"
 "如 http://www.python.org/peps/pep-0263.html 中所指定的那样。\n"
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4236,7 +4245,7 @@ msgstr ""
 "请通过 --from-code 指定�文件的编�，详�\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4247,7 +4256,7 @@ msgstr ""
 "请通过 --from-code 指定�文件的编�，详�\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4258,7 +4267,7 @@ msgstr ""
 "请通过 --from-code 指定�文件的编�，详�\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4269,7 +4278,7 @@ msgstr ""
 "请通过 --from-code 指定�文件的编�，详�\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4280,22 +4289,22 @@ msgstr ""
 "请通过 --from-code 指定�文件的编�，详�\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "未知编�“%s�。先按照 ASCII 处�。"
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d：无效的字符串定义"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d：# ��丢失数字"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d：无效的字符串表达�"
diff --git a/gettext-tools/po/zh_TW.gmo b/gettext-tools/po/zh_TW.gmo
index ef98fcf..83afbc6 100644
--- a/gettext-tools/po/zh_TW.gmo
+++ b/gettext-tools/po/zh_TW.gmo
diff --git a/gettext-tools/po/zh_TW.po b/gettext-tools/po/zh_TW.po
index 6825bff..228facf 100644
--- a/gettext-tools/po/zh_TW.po
+++ b/gettext-tools/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2015-12-28 08:26+0900\n"
+"POT-Creation-Date: 2016-06-11 22:08+0900\n"
 "PO-Revision-Date: 2013-09-03 13:00+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -112,7 +112,7 @@ msgid "Unknown system error"
 msgstr "系統出��明錯誤"
 
 #: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
-#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
+#: gnulib-lib/spawn-pipe.c:238 gnulib-lib/spawn-pipe.c:352
 #: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
@@ -190,15 +190,15 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1141
-#: src/write-java.c:1149 src/write-java.c:1177 src/write-java.c:1189
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "無法建立 “%s�"
 
 #: gnulib-lib/javacomp.c:505 src/write-catalog.c:256 src/write-catalog.c:320
-#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1157
-#: src/write-java.c:1198 src/write-mo.c:812 src/write-qt.c:749
+#: src/write-csharp.c:748 src/write-desktop.c:182 src/write-java.c:1156
+#: src/write-java.c:1197 src/write-mo.c:811 src/write-qt.c:749
 #: src/write-tcl.c:223 src/write-xml.c:75
 #, c-format
 msgid "error while writing \"%s\" file"
@@ -221,39 +221,39 @@ msgid "%s subprocess I/O error"
 msgstr "%s 副行程輸出/輸入錯誤"
 
 #: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38
-#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:564
+#: gnulib-lib/xsetenv.c:37 src/cldr-plurals.c:61 src/msgl-check.c:563
 #: src/po-lex.c:83 src/po-lex.c:102 libgettextpo/gettext-po.c:1326
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe-filter-ii.c:316
 #, c-format
 msgid "creation of threads failed"
 msgstr ""
 
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: gnulib-lib/pipe-filter-ii.c:348 gnulib-lib/pipe-filter-ii.c:505
 #: src/msgexec.c:427
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "寫入至 %s 副行程時發生錯誤"
 
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
+#: gnulib-lib/pipe-filter-ii.c:369 gnulib-lib/pipe-filter-ii.c:548
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "由 %s 副行程讀入資料時出�錯誤"
 
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe-filter-ii.c:422
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "無法和 %s 副行程建立�專用的 I/O"
 
-#: gnulib-lib/pipe-filter-ii.c:336
+#: gnulib-lib/pipe-filter-ii.c:460
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "和 %s 副行程�通時出�錯誤"
 
-#: gnulib-lib/pipe-filter-ii.c:456
+#: gnulib-lib/pipe-filter-ii.c:580
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s 副行程已終止，錯誤碼為 %d"
@@ -292,18 +292,18 @@ msgstr ""
 msgid "setting permissions for %s"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
-#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
+#: gnulib-lib/spawn-pipe.c:144 gnulib-lib/spawn-pipe.c:147
+#: gnulib-lib/spawn-pipe.c:268 gnulib-lib/spawn-pipe.c:271
 #, c-format
 msgid "cannot create pipe"
 msgstr "無法建立管線"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:45
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失敗"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:86
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "無法產生輸出檔 “%s�"
@@ -335,11 +335,11 @@ msgid "The element <%s> does not have attribute <%s>"
 msgstr ""
 
 #: src/cldr-plurals.c:191 src/hostname.c:210 src/msgattrib.c:418
-#: src/msgcat.c:364 src/msgcmp.c:210 src/msgcomm.c:356 src/msgconv.c:304
-#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:914
+#: src/msgcat.c:363 src/msgcmp.c:210 src/msgcomm.c:355 src/msgconv.c:304
+#: src/msgen.c:301 src/msgexec.c:260 src/msgfilter.c:410 src/msgfmt.c:904
 #: src/msggrep.c:513 src/msginit.c:359 src/msgmerge.c:495 src/msgunfmt.c:424
 #: src/msguniq.c:323 src/recode-sr-latin.c:144 src/urlget.c:173
-#: src/xgettext.c:1044
+#: src/xgettext.c:1032
 #, fuzzy, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "請執行 ‘%s --help’ 顯示�外資訊。\n"
@@ -359,7 +359,7 @@ msgid ""
 "If no argument is given, it reads CLDR plural rules from the standard input.\n"
 msgstr ""
 
-#: src/cldr-plurals.c:209 src/msgfmt.c:927 src/xgettext.c:1057
+#: src/cldr-plurals.c:209 src/msgfmt.c:917 src/xgettext.c:1045
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -372,21 +372,21 @@ msgid "  -c, --cldr                  print plural rules in the CLDR format\n"
 msgstr "  -h, --help                  顯示本訊�，然後��\n"
 
 #: src/cldr-plurals.c:216 src/hostname.c:233 src/msgattrib.c:537
-#: src/msgcat.c:472 src/msgcmp.c:261 src/msgcomm.c:458 src/msgconv.c:388
-#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1080
+#: src/msgcat.c:471 src/msgcmp.c:261 src/msgcomm.c:457 src/msgconv.c:388
+#: src/msgen.c:384 src/msgexec.c:309 src/msgfilter.c:510 src/msgfmt.c:1070
 #: src/msggrep.c:631 src/msginit.c:423 src/msgmerge.c:622 src/msgunfmt.c:530
 #: src/msguniq.c:420 src/recode-sr-latin.c:165 src/urlget.c:189
-#: src/xgettext.c:1230
+#: src/xgettext.c:1220
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  顯示本訊�，然後��\n"
 
 #: src/cldr-plurals.c:218 src/hostname.c:235 src/msgattrib.c:539
-#: src/msgcat.c:474 src/msgcmp.c:263 src/msgcomm.c:460 src/msgconv.c:390
-#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1082
+#: src/msgcat.c:473 src/msgcmp.c:263 src/msgcomm.c:459 src/msgconv.c:390
+#: src/msgen.c:386 src/msgexec.c:311 src/msgfilter.c:512 src/msgfmt.c:1072
 #: src/msggrep.c:633 src/msginit.c:425 src/msgmerge.c:624 src/msgunfmt.c:532
 #: src/msguniq.c:422 src/recode-sr-latin.c:168 src/urlget.c:191
-#: src/xgettext.c:1232
+#: src/xgettext.c:1222
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               顯示版本資訊，然後��\n"
@@ -396,20 +396,20 @@ msgstr "  -V, --version               顯示版本資訊，然後��\n"
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
 #: src/cldr-plurals.c:225 src/hostname.c:242 src/msgattrib.c:546
-#: src/msgcat.c:481 src/msgcmp.c:270 src/msgcomm.c:467 src/msgconv.c:397
-#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1093
+#: src/msgcat.c:480 src/msgcmp.c:270 src/msgcomm.c:466 src/msgconv.c:397
+#: src/msgen.c:393 src/msgexec.c:318 src/msgfilter.c:519 src/msgfmt.c:1083
 #: src/msggrep.c:640 src/msginit.c:432 src/msgmerge.c:635 src/msgunfmt.c:541
 #: src/msguniq.c:429 src/recode-sr-latin.c:175 src/urlget.c:200
-#: src/xgettext.c:1239
+#: src/xgettext.c:1229
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "請� <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 
 #: src/cldr-plurals.c:289 src/hostname.c:181 src/msgattrib.c:356
-#: src/msgcat.c:295 src/msgcmp.c:173 src/msgcomm.c:286 src/msgconv.c:245
-#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:444
+#: src/msgcat.c:294 src/msgcmp.c:173 src/msgcomm.c:285 src/msgconv.c:245
+#: src/msgen.c:242 src/msgexec.c:187 src/msgfilter.c:289 src/msgfmt.c:446
 #: src/msggrep.c:420 src/msginit.c:269 src/msgmerge.c:357 src/msgunfmt.c:263
 #: src/msguniq.c:265 src/recode-sr-latin.c:111 src/urlget.c:144
-#: src/xgettext.c:678
+#: src/xgettext.c:681
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -419,10 +419,10 @@ msgid ""
 msgstr ""
 
 #: src/cldr-plurals.c:295 src/hostname.c:187 src/msgattrib.c:362
-#: src/msgcat.c:301 src/msgcmp.c:179 src/msgcomm.c:292 src/msgconv.c:251
-#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:450
+#: src/msgcat.c:300 src/msgcmp.c:179 src/msgcomm.c:291 src/msgconv.c:251
+#: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msgfmt.c:452
 #: src/msggrep.c:426 src/msginit.c:275 src/msgmerge.c:363 src/msgunfmt.c:269
-#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:684
+#: src/msguniq.c:271 src/urlget.c:150 src/xgettext.c:687
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
@@ -454,37 +454,37 @@ msgstr ""
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
 #: src/file-list.c:54 src/msggrep.c:248 src/open-catalog.c:123
-#: src/read-mo.c:262 src/read-tcl.c:126 src/urlget.c:217
-#: src/write-desktop.c:172 src/xgettext.c:2184 src/xgettext.c:2197
-#: src/xgettext.c:2207
+#: src/read-mo.c:261 src/read-tcl.c:126 src/urlget.c:217
+#: src/write-desktop.c:172 src/xgettext.c:2174 src/xgettext.c:2187
+#: src/xgettext.c:2197
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "當開啟檔案 %s 準備讀�時發生錯誤"
 
 #: src/format-awk.c:510 src/format-boost.c:618 src/format-elisp.c:349
-#: src/format-gcc-internal.c:627 src/format-kde.c:224 src/format-librep.c:313
-#: src/format-lua.c:228 src/format-pascal.c:398 src/format-perl.c:585
-#: src/format-php.c:351 src/format-qt.c:174 src/format-tcl.c:391
-#: src/format-ycp.c:148
+#: src/format-gcc-internal.c:627 src/format-javascript.c:356
+#: src/format-kde.c:224 src/format-librep.c:313 src/format-lua.c:228
+#: src/format-pascal.c:398 src/format-perl.c:585 src/format-php.c:351
+#: src/format-qt.c:174 src/format-tcl.c:391 src/format-ycp.c:148
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "‘%2$s’ 中第 %1$u 個引數的�格在 ‘msgid’ 中並�存在"
 
 #: src/format-awk.c:521 src/format-boost.c:629 src/format-elisp.c:360
-#: src/format-gcc-internal.c:638 src/format-kde.c:235 src/format-librep.c:324
-#: src/format-lua.c:235 src/format-pascal.c:409 src/format-perl.c:596
-#: src/format-php.c:362 src/format-qt.c:171 src/format-tcl.c:402
-#: src/format-ycp.c:145
+#: src/format-gcc-internal.c:638 src/format-javascript.c:367
+#: src/format-kde.c:235 src/format-librep.c:324 src/format-lua.c:235
+#: src/format-pascal.c:409 src/format-perl.c:596 src/format-php.c:362
+#: src/format-qt.c:171 src/format-tcl.c:402 src/format-ycp.c:145
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "第 %u 個引數的�格在‘%s’中並�存在"
 
 #: src/format-awk.c:541 src/format-boost.c:649 src/format-c.c:147
 #: src/format-elisp.c:380 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-javascript.c:228
+#: src/format-gfc-internal.c:372 src/format-javascript.c:390
 #: src/format-librep.c:344 src/format-lua.c:242 src/format-pascal.c:429
-#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:528
+#: src/format-perl.c:616 src/format-php.c:382 src/format-python.c:527
 #: src/format-tcl.c:422
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
@@ -520,8 +520,7 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "字串中有��第 %u 個引數，但忽略了第 %u 個。"
 
 #: src/format-c.c:138 src/format-csharp.c:207 src/format-gfc-internal.c:363
-#: src/format-javascript.c:216 src/format-python.c:516
-#: src/format-qt-plural.c:111
+#: src/format-python.c:515 src/format-qt-plural.c:111
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "‘msgid’ 和 ‘%s’ 的格��格數目�符"
@@ -810,8 +809,8 @@ msgstr "‘msgid’ 和 ‘%s’ 的格��格並��等"
 msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "‘%s’ 的格��格並� ‘msgid’ 的格��格的一部份"
 
-#: src/format-perl-brace.c:199 src/format-python-brace.c:435
-#: src/format-python-brace.c:448 src/format-python.c:472 src/format-sh.c:309
+#: src/format-perl-brace.c:199 src/format-python-brace.c:442
+#: src/format-python-brace.c:455 src/format-python.c:471 src/format-sh.c:309
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "格� ‘%s’ 的�格在 ‘%s’ 中並�存在"
@@ -828,59 +827,59 @@ msgstr ""
 msgid "In the directive number %u, '%c' cannot start a field name."
 msgstr "在第 %u 個指令，‘,’ 後�的�是數字。"
 
-#: src/format-python-brace.c:151
+#: src/format-python-brace.c:157
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getattr argument."
 msgstr "在第 %u 個指令，‘,’ 後�的�是數字。"
 
-#: src/format-python-brace.c:166
+#: src/format-python-brace.c:171
 #, fuzzy, c-format
 msgid "In the directive number %u, '%c' cannot start a getitem argument."
 msgstr "在第 %u 個指令，‘,’ 後�的�是數字。"
 
-#: src/format-python-brace.c:186
+#: src/format-python-brace.c:193
 #, fuzzy, c-format
 msgid ""
 "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "在第 %u 個指令，‘,’ 後�的�是數字。"
 
-#: src/format-python-brace.c:271
+#: src/format-python-brace.c:278
 #, fuzzy, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "第 %u 個指令中的數字 0 �是正整數。"
 
-#: src/format-python.c:116
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:355
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:431
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "‘msgid’ 裡的�格�應的是雜湊表 (mapping)，而 ‘%s’ 的�是固定有�列 (tuple)"
 
-#: src/format-python.c:438
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "‘msgid’ 裡的�格�應的是固定有�列 (tuple)，而 ‘%s’ 的�是雜湊表 (mapping)"
 
-#: src/format-python.c:461 src/format-sh.c:298
+#: src/format-python.c:460 src/format-sh.c:298
 #, fuzzy, c-format
 msgid ""
 "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "‘%2$s’ 中的引數 ‘%1$s’ 的格�在 ‘msgid’ 中並�存在"
 
-#: src/format-python.c:495
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
@@ -929,7 +928,7 @@ msgid ""
 msgstr "第 %u 個指令最後一個字元�是 1 至 9 之間的整數。"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:301 src/msgconv.c:251
+#: src/hostname.c:187 src/msgattrib.c:362 src/msgcat.c:300 src/msgconv.c:251
 #: src/msgen.c:248 src/msgexec.c:193 src/msgfilter.c:295 src/msggrep.c:426
 #: src/msginit.c:275 src/msguniq.c:271 src/recode-sr-latin.c:122
 #: src/urlget.c:150
@@ -975,11 +974,11 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主機的 IP 地�\n"
 
-#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:470 src/msgcmp.c:259
-#: src/msgcomm.c:456 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
-#: src/msgfilter.c:508 src/msgfmt.c:1078 src/msggrep.c:629 src/msginit.c:421
+#: src/hostname.c:231 src/msgattrib.c:535 src/msgcat.c:469 src/msgcmp.c:259
+#: src/msgcomm.c:455 src/msgconv.c:386 src/msgen.c:382 src/msgexec.c:307
+#: src/msgfilter.c:508 src/msgfmt.c:1068 src/msggrep.c:629 src/msginit.c:421
 #: src/msgmerge.c:620 src/msgunfmt.c:528 src/msguniq.c:418
-#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1228
+#: src/recode-sr-latin.c:162 src/urlget.c:187 src/xgettext.c:1218
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "顯示資訊：\n"
@@ -1051,12 +1050,12 @@ msgstr ""
 msgid "at most one input file allowed"
 msgstr "最多�接�一個輸入檔"
 
-#: src/msgattrib.c:383 src/msgcat.c:317 src/msgcomm.c:302 src/msgconv.c:272
-#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:503 src/msgfmt.c:511
-#: src/msgfmt.c:526 src/msgfmt.c:548 src/msggrep.c:447 src/msgmerge.c:388
+#: src/msgattrib.c:383 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:272
+#: src/msgen.c:270 src/msgfilter.c:310 src/msgfmt.c:505 src/msgfmt.c:513
+#: src/msgfmt.c:528 src/msgfmt.c:550 src/msggrep.c:447 src/msgmerge.c:388
 #: src/msgmerge.c:393 src/msgmerge.c:398 src/msgmerge.c:419 src/msgunfmt.c:300
-#: src/msguniq.c:292 src/xgettext.c:694 src/xgettext.c:701 src/xgettext.c:704
-#: src/xgettext.c:707 src/xgettext.c:755
+#: src/msguniq.c:292 src/xgettext.c:697 src/xgettext.c:704 src/xgettext.c:707
+#: src/xgettext.c:710 src/xgettext.c:734
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 兩者是互�相容的"
@@ -1073,7 +1072,7 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr "根據訊�的屬性�濾翻譯檔裡的�目，並處�這些屬性。\n"
 
-#: src/msgattrib.c:431 src/msgcat.c:385 src/msgcmp.c:228 src/msgcomm.c:376
+#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:228 src/msgcomm.c:375
 #: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:288 src/msgfilter.c:422
 #: src/msggrep.c:527 src/msginit.c:373 src/msgmerge.c:516 src/msgunfmt.c:436
 #: src/msguniq.c:343
@@ -1082,10 +1081,10 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "長�項必須用的引數在使用短�項時也是必須的。\n"
 
-#: src/msgattrib.c:434 src/msgcat.c:388 src/msgcmp.c:231 src/msgcomm.c:379
+#: src/msgattrib.c:434 src/msgcat.c:387 src/msgcmp.c:231 src/msgcomm.c:378
 #: src/msgconv.c:319 src/msgen.c:320 src/msgexec.c:291 src/msgfilter.c:425
-#: src/msgfmt.c:932 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
-#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1062
+#: src/msgfmt.c:922 src/msggrep.c:530 src/msginit.c:376 src/msgmerge.c:519
+#: src/msgunfmt.c:450 src/msguniq.c:346 src/xgettext.c:1050
 #, c-format
 msgid "Input file location:\n"
 msgstr "輸入檔�置：\n"
@@ -1095,10 +1094,10 @@ msgstr "輸入檔�置：\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   用作輸入的 PO 檔\n"
 
-#: src/msgattrib.c:438 src/msgcat.c:394 src/msgcmp.c:237 src/msgcomm.c:385
+#: src/msgattrib.c:438 src/msgcat.c:393 src/msgcmp.c:237 src/msgcomm.c:384
 #: src/msgconv.c:323 src/msgen.c:324 src/msgexec.c:295 src/msgfilter.c:429
-#: src/msgfmt.c:936 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
-#: src/xgettext.c:1068
+#: src/msgfmt.c:926 src/msggrep.c:534 src/msgmerge.c:525 src/msguniq.c:350
+#: src/xgettext.c:1056
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1110,23 +1109,23 @@ msgstr "  -D, --directory=目錄        �尋輸入檔時加入指定<目錄>\n
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’，則由標準輸入讀�內容。\n"
 
-#: src/msgattrib.c:443 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:328
-#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:960 src/msggrep.c:539
+#: src/msgattrib.c:443 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:328
+#: src/msgen.c:329 src/msgfilter.c:434 src/msgfmt.c:950 src/msggrep.c:539
 #: src/msginit.c:384 src/msgmerge.c:537 src/msgunfmt.c:490 src/msguniq.c:355
-#: src/xgettext.c:1073
+#: src/xgettext.c:1061
 #, c-format
 msgid "Output file location:\n"
 msgstr "輸出檔�置：\n"
 
-#: src/msgattrib.c:445 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:330
-#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:962 src/msgfmt.c:1011
-#: src/msgfmt.c:1030 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
+#: src/msgattrib.c:445 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:330
+#: src/msgen.c:331 src/msgfilter.c:436 src/msgfmt.c:952 src/msgfmt.c:1001
+#: src/msgfmt.c:1020 src/msggrep.c:541 src/msgmerge.c:539 src/msgunfmt.c:492
 #: src/msguniq.c:357
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=檔案      將輸出的內容寫入指定<檔案>\n"
 
-#: src/msgattrib.c:447 src/msgcat.c:403 src/msgcomm.c:394 src/msgconv.c:332
+#: src/msgattrib.c:447 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:332
 #: src/msgen.c:333 src/msgfilter.c:438 src/msggrep.c:543 src/msgmerge.c:541
 #: src/msgunfmt.c:494 src/msguniq.c:359
 #, c-format
@@ -1135,7 +1134,7 @@ msgid ""
 "or if it is -.\n"
 msgstr "如果沒有指定<輸出檔>或<輸出檔>是 ‘-’，則會在標準輸出顯示�果。\n"
 
-#: src/msgattrib.c:451 src/msgcat.c:407 src/msgcomm.c:398 src/msguniq.c:363
+#: src/msgattrib.c:451 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:363
 #, c-format
 msgid "Message selection:\n"
 msgstr "篩�訊�：\n"
@@ -1242,9 +1241,9 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等於 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410
+#: src/msgattrib.c:492 src/msgcat.c:418 src/msgcmp.c:251 src/msgcomm.c:409
 #: src/msgconv.c:343 src/msgen.c:337 src/msgexec.c:300 src/msgfilter.c:463
-#: src/msgfmt.c:1040 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
+#: src/msgfmt.c:1030 src/msggrep.c:586 src/msginit.c:392 src/msgmerge.c:574
 #: src/msguniq.c:370
 #, c-format
 msgid "Input file syntax:\n"
@@ -1266,17 +1265,17 @@ msgid ""
 msgstr ""
 "      --stringtable-input     以 NeXTstep/GNUstep .strings 格�處�輸入檔\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:427 src/msgcomm.c:418 src/msgconv.c:350
-#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1068 src/msggrep.c:593
+#: src/msgattrib.c:499 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:350
+#: src/msgen.c:344 src/msgfilter.c:470 src/msgfmt.c:1058 src/msggrep.c:593
 #: src/msginit.c:399 src/msgmerge.c:582 src/msgunfmt.c:498 src/msguniq.c:377
-#: src/xgettext.c:1170
+#: src/xgettext.c:1162
 #, c-format
 msgid "Output details:\n"
 msgstr "輸出內容細節：\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:352
+#: src/msgattrib.c:501 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:352
 #: src/msgen.c:348 src/msgfilter.c:472 src/msggrep.c:595 src/msginit.c:405
-#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1172
+#: src/msgmerge.c:586 src/msgunfmt.c:500 src/msguniq.c:384 src/xgettext.c:1164
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1285,16 +1284,16 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:505 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:356
+#: src/msgattrib.c:505 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:356
 #: src/msgen.c:352 src/msgfilter.c:476 src/msggrep.c:599 src/msginit.c:409
-#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1176
+#: src/msgmerge.c:590 src/msgunfmt.c:504 src/msguniq.c:388 src/xgettext.c:1168
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c:507 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:358
+#: src/msgattrib.c:507 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:358
 #: src/msgen.c:354 src/msgmerge.c:592 src/msgunfmt.c:506 src/msguniq.c:390
-#: src/xgettext.c:1178
+#: src/xgettext.c:1170
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1302,9 +1301,9 @@ msgstr ""
 "  -e, --no-escape             輸出�果�使用 C 轉義控制�列\n"
 "                              (escape sequence)，這是�設�作方�\n"
 
-#: src/msgattrib.c:509 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:360
+#: src/msgattrib.c:509 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:360
 #: src/msgen.c:356 src/msgfilter.c:480 src/msgmerge.c:594 src/msgunfmt.c:508
-#: src/msguniq.c:392 src/xgettext.c:1180
+#: src/msguniq.c:392 src/xgettext.c:1172
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1313,66 +1312,66 @@ msgstr ""
 "sequence)\n"
 "                              ，而�使用� ASCII 字元\n"
 
-#: src/msgattrib.c:511 src/msgcat.c:446 src/msgcomm.c:430 src/msgconv.c:362
+#: src/msgattrib.c:511 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:362
 #: src/msgen.c:358 src/msgfilter.c:482 src/msggrep.c:605 src/msgmerge.c:596
-#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1182
+#: src/msgunfmt.c:510 src/msguniq.c:394 src/xgettext.c:1174
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算沒有內容�產生 PO 檔\n"
 
-#: src/msgattrib.c:513 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:1184
+#: src/msgattrib.c:513 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:396
+#: src/xgettext.c:1176
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                寫入的 .po 檔內容會進行縮排\n"
 
-#: src/msgattrib.c:515 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:1186
+#: src/msgattrib.c:515 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:398
+#: src/xgettext.c:1178
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           �加入類似 '#: 檔案:行號' 的�代碼�置\n"
 
-#: src/msgattrib.c:517 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:1188
+#: src/msgattrib.c:517 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:400
+#: src/xgettext.c:1180
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          會加入 '#: 檔案:行號' 格�的�代碼�置 (�設)\n"
 
-#: src/msgattrib.c:519 src/msgcat.c:454 src/msgcomm.c:438 src/msguniq.c:402
-#: src/xgettext.c:1190
+#: src/msgattrib.c:519 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:402
+#: src/xgettext.c:1182
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                產生的 .po 檔內容跟隨嚴格的 Uniforum 格�\n"
 
-#: src/msgattrib.c:521 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:372
+#: src/msgattrib.c:521 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:372
 #: src/msgen.c:368 src/msgfilter.c:494 src/msggrep.c:615 src/msginit.c:411
 #: src/msgmerge.c:606 src/msgunfmt.c:516 src/msguniq.c:404
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output    產生 Java .properties 檔案\n"
 
-#: src/msgattrib.c:523 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:374
+#: src/msgattrib.c:523 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:374
 #: src/msgen.c:370 src/msgfilter.c:496 src/msggrep.c:617 src/msginit.c:413
-#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1194
+#: src/msgmerge.c:608 src/msgunfmt.c:518 src/msguniq.c:406 src/xgettext.c:1186
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    產生 NeXTstep/GNUstep .strings 檔案\n"
 
-#: src/msgattrib.c:525 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:376
+#: src/msgattrib.c:525 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:376
 #: src/msgen.c:372 src/msgfilter.c:498 src/msggrep.c:619 src/msginit.c:415
-#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1200
+#: src/msgmerge.c:610 src/msgunfmt.c:520 src/msguniq.c:408 src/xgettext.c:1190
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          指定輸出檔�行寬度\n"
 
-#: src/msgattrib.c:527 src/msgcat.c:462 src/msgcomm.c:446 src/msgconv.c:378
+#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378
 #: src/msgen.c:374 src/msgfilter.c:500 src/msggrep.c:621 src/msginit.c:417
-#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1202
+#: src/msgmerge.c:612 src/msgunfmt.c:522 src/msguniq.c:410 src/xgettext.c:1192
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1380,31 +1379,31 @@ msgid ""
 msgstr ""
 "      --no-wrap               �使輸出的訊�超出�寬，也�將輸出的訊�斷行\n"
 
-#: src/msgattrib.c:530 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:381
+#: src/msgattrib.c:530 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:381
 #: src/msgen.c:377 src/msgfilter.c:503 src/msgmerge.c:615 src/msgunfmt.c:525
-#: src/msguniq.c:413 src/xgettext.c:1205
+#: src/msguniq.c:413 src/xgettext.c:1195
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           將輸出�果排�\n"
 
-#: src/msgattrib.c:532 src/msgcat.c:467 src/msgcomm.c:451 src/msgconv.c:383
+#: src/msgattrib.c:532 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:383
 #: src/msgen.c:379 src/msgfilter.c:505 src/msgmerge.c:617 src/msguniq.c:415
-#: src/xgettext.c:1207
+#: src/xgettext.c:1197
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          根據檔案�置排列輸出�果\n"
 
-#: src/msgcat.c:323 src/msgcomm.c:328
+#: src/msgcat.c:322 src/msgcomm.c:327
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "��能出�的�擇�件 (%d < n <%d)"
 
-#: src/msgcat.c:368 src/msgcomm.c:360 src/xgettext.c:1048
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:1036
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [�項] [輸入檔]...\n"
 
-#: src/msgcat.c:373
+#: src/msgcat.c:372
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1425,23 +1424,23 @@ msgstr ""
 "--use-first �項，那樣則會由第一個�有該翻譯�目的檔案�得資料。\n"
 "所有 PO 檔中的翻譯�目的檔案�置都會累�下來。\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:1064
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:1052
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               輸入檔\n"
 
-#: src/msgcat.c:392 src/msgcomm.c:383 src/xgettext.c:1066
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:1054
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       由 FILE 讀�所有輸入檔的�置\n"
 
-#: src/msgcat.c:396 src/msgcomm.c:387 src/msgen.c:326 src/msgfmt.c:938
-#: src/xgettext.c:1070
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:326 src/msgfmt.c:928
+#: src/xgettext.c:1058
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果輸入檔是 - 的話，會由標準輸入讀�資料。\n"
 
-#: src/msgcat.c:409 src/msgcomm.c:400
+#: src/msgcat.c:408 src/msgcomm.c:399
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1450,7 +1449,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      當一項�目的��翻譯少於多少種就會顯示，\n"
 "                              �設為無� (�顯示所有�目)\n"
 
-#: src/msgcat.c:412
+#: src/msgcat.c:411
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1459,7 +1458,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      當一項�目的��翻譯多於多少種�會顯示，\n"
 "                              �設為 0 種 (�顯示所有�目)\n"
 
-#: src/msgcat.c:415 src/msgcomm.c:406
+#: src/msgcat.c:414 src/msgcomm.c:405
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1468,14 +1467,14 @@ msgstr ""
 "  -u, --unique                等於 --less-than=2，表示�顯示\n"
 "                              �有一種翻譯的字�\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:253 src/msgcomm.c:412 src/msgfmt.c:1042
+#: src/msgcat.c:420 src/msgcmp.c:253 src/msgcomm.c:411 src/msgfmt.c:1032
 #: src/msgmerge.c:576
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      輸入檔格�為 Java .properties 格�\n"
 
-#: src/msgcat.c:423 src/msgcmp.c:255 src/msgcomm.c:414 src/msgfmt.c:1044
+#: src/msgcat.c:422 src/msgcmp.c:255 src/msgcomm.c:413 src/msgfmt.c:1034
 #: src/msgmerge.c:578
 #, c-format
 msgid ""
@@ -1484,12 +1483,12 @@ msgid ""
 msgstr ""
 "      --stringtable-input     輸入檔格�為 NeXTstep/GNUstep .strings 格�\n"
 
-#: src/msgcat.c:429 src/msgconv.c:338 src/msguniq.c:379
+#: src/msgcat.c:428 src/msgconv.c:338 src/msguniq.c:379
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=�稱          輸出的編碼\n"
 
-#: src/msgcat.c:431 src/msguniq.c:381
+#: src/msgcat.c:430 src/msguniq.c:381
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1498,14 +1497,14 @@ msgstr ""
 "      --use-first             ���使用第一個出�的翻譯，而�會將所有\n"
 "                              翻譯�併起來\n"
 
-#: src/msgcat.c:434 src/msgen.c:346 src/msgmerge.c:584
+#: src/msgcat.c:433 src/msgen.c:346 src/msgmerge.c:584
 #, c-format
 msgid ""
 "      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:179 src/msgcomm.c:292 src/msgmerge.c:363
+#: src/msgcmp.c:179 src/msgcomm.c:291 src/msgmerge.c:363
 msgid "Peter Miller"
 msgstr ""
 
@@ -1608,18 +1607,18 @@ msgstr "這個訊�有使用�但在 %s 中沒有定義"
 msgid "warning: this message is not used"
 msgstr "警告：沒有使用這個訊�"
 
-#: src/msgcmp.c:554 src/msgfmt.c:787 src/msgfmt.c:1633 src/xgettext.c:1021
+#: src/msgcmp.c:554 src/msgfmt.c:777 src/msgfmt.c:1623 src/xgettext.c:1008
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "找到 %d 個嚴�錯誤"
 
-#: src/msgcomm.c:317
+#: src/msgcomm.c:316
 #, c-format
 msgid "at least two files must be specified"
 msgstr "必須指定至少兩個檔案"
 
-#: src/msgcomm.c:365
+#: src/msgcomm.c:364
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1637,7 +1636,7 @@ msgstr ""
 "訊�）。翻譯內容�自行加上的註解和原程�碼的註解都會�留，但�會由第一個\n"
 "�有該翻譯�目的檔案�得。所有 PO 檔中的翻譯�目的檔案�置都會累�下來。\n"
 
-#: src/msgcomm.c:403
+#: src/msgcomm.c:402
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1645,7 +1644,7 @@ msgid ""
 msgstr ""
 "  ->, --more-than=NUMBER      顯示出�多於指定次數的字�，�設為 1 次\n"
 
-#: src/msgcomm.c:453 src/xgettext.c:1209
+#: src/msgcomm.c:452 src/xgettext.c:1199
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1690,7 +1689,7 @@ msgstr "      --add-location          �留�代碼�置 (�設)\n"
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                嚴格�從 Uniforum 格�\n"
 
-#: src/msgen.c:259 src/msgfmt.c:463 src/xgettext.c:724
+#: src/msgen.c:259 src/msgfmt.c:465 src/xgettext.c:727
 #, c-format
 msgid "no input file given"
 msgstr "未指定輸入檔"
@@ -1865,114 +1864,114 @@ msgstr "      --keep-header           �護標頭內容，�濾內容時�會
 msgid "filter output is not terminated with a newline"
 msgstr "檔案 %s 包�並�以 NUL 為�尾的字串"
 
-#: src/msgfmt.c:372
+#: src/msgfmt.c:374
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的引數應該是一個標點符號"
 
-#: src/msgfmt.c:419
+#: src/msgfmt.c:421
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:450 src/msgunfmt.c:269 src/xgettext.c:684
+#: src/msgfmt.c:452 src/msgunfmt.c:269 src/xgettext.c:687
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:471
+#: src/msgfmt.c:473
 #, fuzzy, c-format
 msgid "no input file should be given if %s and %s are specified"
 msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’，則由標準輸入讀�內容。\n"
 
-#: src/msgfmt.c:517 src/msgfmt.c:539 src/msgfmt.c:561 src/msgunfmt.c:331
+#: src/msgfmt.c:519 src/msgfmt.c:541 src/msgfmt.c:563 src/msgunfmt.c:331
 #: src/msgunfmt.c:354
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需�指定 “-d 目錄� �項"
 
-#: src/msgfmt.c:532 src/msgfmt.c:554 src/msgfmt.c:589 src/msgfmt.c:617
+#: src/msgfmt.c:534 src/msgfmt.c:556 src/msgfmt.c:591 src/msgfmt.c:619
 #: src/msgunfmt.c:324 src/msgunfmt.c:347
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需�指定 “-l locale� �項"
 
-#: src/msgfmt.c:571 src/msgfmt.c:599
+#: src/msgfmt.c:573 src/msgfmt.c:601
 #, fuzzy, c-format
 msgid "%s requires a \"--template template\" specification"
 msgstr "%s 需�指定 “-l locale� �項"
 
-#: src/msgfmt.c:578 src/msgfmt.c:606
+#: src/msgfmt.c:580 src/msgfmt.c:608
 #, fuzzy, c-format
 msgid "%s requires a \"-o file\" specification"
 msgstr "%s 需�指定 “-l locale� �項"
 
-#: src/msgfmt.c:584 src/msgfmt.c:612
+#: src/msgfmt.c:586 src/msgfmt.c:614
 #, fuzzy, c-format
 msgid "%s and %s are mutually exclusive in %s"
 msgstr "%s 和 %s 兩者是互�相容的"
 
-#: src/msgfmt.c:626 src/msgunfmt.c:363 src/msgunfmt.c:369
+#: src/msgfmt.c:628 src/msgunfmt.c:363 src/msgunfmt.c:369
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s �能�� %s 或 %s 一起使用�有效"
 
-#: src/msgfmt.c:632 src/msgfmt.c:638
+#: src/msgfmt.c:634 src/msgfmt.c:640
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s �能�� %s�%s 或 %s 一起使用�有效"
 
-#: src/msgfmt.c:723
+#: src/msgfmt.c:713
 #, fuzzy, c-format
 msgid "cannot locate ITS rules for %s"
 msgstr "無法產生輸出檔 “%s�"
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:884
+#: src/msgfmt.c:874
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:878
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "已翻譯 %d 個�目"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:883
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，有 %d 個�目標記為模糊翻譯"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:888
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，還有 %d 個�目未翻譯"
 
-#: src/msgfmt.c:918
+#: src/msgfmt.c:908
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [�項] filename.po ...\n"
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:912
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模�翻譯檔產生二元碼翻譯檔。\n"
 
-#: src/msgfmt.c:934
+#: src/msgfmt.c:924
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             輸入檔\n"
 
-#: src/msgfmt.c:941 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1106
+#: src/msgfmt.c:931 src/msgmerge.c:531 src/msgunfmt.c:439 src/xgettext.c:1094
 #, c-format
 msgid "Operation mode:\n"
 msgstr "�作模�：\n"
 
-#: src/msgfmt.c:943
+#: src/msgfmt.c:933
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1980,7 +1979,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java 模�：產生 Java ResourceBundle class\n"
 
-#: src/msgfmt.c:945
+#: src/msgfmt.c:935
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1989,12 +1988,12 @@ msgstr ""
 "      --java2                 類似 --java，�設格�為 Java2 (JDK 1.2 或以"
 "上)\n"
 
-#: src/msgfmt.c:947
+#: src/msgfmt.c:937
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模�，會產生 .NET .dll 檔\n"
 
-#: src/msgfmt.c:949
+#: src/msgfmt.c:939
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -2003,50 +2002,50 @@ msgstr ""
 "      --csharp-resources      C# resources 模�，會產生 .NET .resources 檔"
 "案\n"
 
-#: src/msgfmt.c:951
+#: src/msgfmt.c:941
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模�：產生 tcl/msgcat .msg 檔\n"
 
-#: src/msgfmt.c:953
+#: src/msgfmt.c:943
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模�：產生 Qt .qm 檔\n"
 
-#: src/msgfmt.c:955
+#: src/msgfmt.c:945
 #, fuzzy, c-format
 msgid ""
 "      --desktop               Desktop Entry mode: generate a .desktop file\n"
 msgstr "      --qt                    Qt 模�：產生 Qt .qm 檔\n"
 
-#: src/msgfmt.c:957
+#: src/msgfmt.c:947
 #, fuzzy, c-format
 msgid "      --xml                   XML mode: generate XML file\n"
 msgstr "      --qt                    Qt 模�：產生 Qt .qm 檔\n"
 
-#: src/msgfmt.c:964
+#: src/msgfmt.c:954
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                強制使用 Uniforum 格�翻譯檔\n"
 
-#: src/msgfmt.c:966 src/xgettext.c:1081
+#: src/msgfmt.c:956 src/xgettext.c:1069
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果輸出檔是 - 的話，則會在標準輸出顯示�果。\n"
 
-#: src/msgfmt.c:969
+#: src/msgfmt.c:959
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java 模�的輸出檔�置：\n"
 
-#: src/msgfmt.c:971 src/msgfmt.c:987 src/msgunfmt.c:459 src/msgunfmt.c:470
+#: src/msgfmt.c:961 src/msgfmt.c:977 src/msgunfmt.c:459 src/msgunfmt.c:470
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource �稱\n"
 
-#: src/msgfmt.c:973 src/msgfmt.c:989 src/msgfmt.c:999 src/msgfmt.c:1009
-#: src/msgfmt.c:1026 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
+#: src/msgfmt.c:963 src/msgfmt.c:979 src/msgfmt.c:989 src/msgfmt.c:999
+#: src/msgfmt.c:1016 src/msgunfmt.c:461 src/msgunfmt.c:472 src/msgunfmt.c:482
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -2055,7 +2054,7 @@ msgstr ""
 "  -l, --locale=LOCALE         指定語言，�以用語言�稱或者 xy_XY 格�的\n"
 "                              語言代號\n"
 
-#: src/msgfmt.c:975
+#: src/msgfmt.c:965
 #, fuzzy, c-format
 msgid ""
 "      --source                produce a .java file, instead of a .class "
@@ -2063,13 +2062,13 @@ msgid ""
 msgstr ""
 "      --tcl                   Tcl 模�：輸入資料是 tcl/msgcat .msg 檔\n"
 
-#: src/msgfmt.c:977
+#: src/msgfmt.c:967
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目錄                     class 目錄層的基本目錄\n"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:969
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2080,58 +2079,58 @@ msgstr ""
 "class �稱是由語言�稱和 resource �稱�併來決定的，兩者之間會用底線分隔。\n"
 "-d �項是必須的。class 檔會存放在指定的目錄。\n"
 
-#: src/msgfmt.c:985
+#: src/msgfmt.c:975
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# 模�的輸出檔�置：\n"
 
-#: src/msgfmt.c:991 src/msgunfmt.c:474
+#: src/msgfmt.c:981 src/msgunfmt.c:474
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:993
+#: src/msgfmt.c:983
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:997
+#: src/msgfmt.c:987
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 模�的輸出檔�置：\n"
 
-#: src/msgfmt.c:1001 src/msgunfmt.c:484
+#: src/msgfmt.c:991 src/msgunfmt.c:484
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:1003
+#: src/msgfmt.c:993
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:1007
+#: src/msgfmt.c:997
 #, c-format
 msgid "Desktop Entry mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1013
+#: src/msgfmt.c:1003
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1015 src/msgfmt.c:1034
+#: src/msgfmt.c:1005 src/msgfmt.c:1024
 #, fuzzy, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
 msgstr "  -d 目錄                     class 目錄層的基本目錄\n"
 
-#: src/msgfmt.c:1017 src/xgettext.c:1135
+#: src/msgfmt.c:1007 src/xgettext.c:1123
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -2140,7 +2139,7 @@ msgstr ""
 "  -k, --keyword[=WORD]        �留�的�外關�字 (如果沒有指定，\n"
 "                              表示�使用�設的關�字)\n"
 
-#: src/msgfmt.c:1020 src/msgfmt.c:1036
+#: src/msgfmt.c:1010 src/msgfmt.c:1026
 #, c-format
 msgid ""
 "The -l, -o, and --template options are mandatory.  If -D is specified, "
@@ -2148,27 +2147,27 @@ msgid ""
 "files are read from the directory instead of the command line arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:1024
+#: src/msgfmt.c:1014
 #, c-format
 msgid "XML mode options:\n"
 msgstr ""
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1018
 #, c-format
 msgid "  -L, --language=NAME         recognise the specified XML language\n"
 msgstr ""
 
-#: src/msgfmt.c:1032
+#: src/msgfmt.c:1022
 #, c-format
 msgid "  --template=TEMPLATE         an XML file used as a template\n"
 msgstr ""
 
-#: src/msgfmt.c:1048 src/xgettext.c:1098
+#: src/msgfmt.c:1038 src/xgettext.c:1086
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "輸入檔處�：\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:1040
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2179,19 +2178,19 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:1053
+#: src/msgfmt.c:1043
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          檢查�種程�語言的格�字串\n"
 
-#: src/msgfmt.c:1055
+#: src/msgfmt.c:1045
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          確�標頭欄�存在和內容正確\n"
 
-#: src/msgfmt.c:1057
+#: src/msgfmt.c:1047
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2200,7 +2199,7 @@ msgstr ""
 "      --check-domain          檢查 domain 關�字和 --output-file �項之間\n"
 "                                有沒有��\n"
 
-#: src/msgfmt.c:1060
+#: src/msgfmt.c:1050
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2209,7 +2208,7 @@ msgstr ""
 "  -C, --check-compatibility   確� GNU msgfmt �作的方�和 X/Open msgfmt 兼"
 "容\n"
 
-#: src/msgfmt.c:1062
+#: src/msgfmt.c:1052
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2217,19 +2216,19 @@ msgid ""
 "                                menu items\n"
 msgstr "      --check-accelerators[=CHAR]  檢查�單項目中代表�徑�的字元\n"
 
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1055
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在輸出�果中顯示模糊翻譯\n"
 
-#: src/msgfmt.c:1070
+#: src/msgfmt.c:1060
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=數字        以<數字>個�元組為單��置字串�置(�設：%d)\n"
 
-#: src/msgfmt.c:1072
+#: src/msgfmt.c:1062
 #, c-format
 msgid ""
 "      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
@@ -2238,90 +2237,90 @@ msgid ""
 "platform)\n"
 msgstr ""
 
-#: src/msgfmt.c:1075
+#: src/msgfmt.c:1065
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               二元碼檔�會包�雜湊表 (hash table) 在內\n"
 
-#: src/msgfmt.c:1084
+#: src/msgfmt.c:1074
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            顯示有關翻譯訊�的統計\n"
 
-#: src/msgfmt.c:1086 src/msgmerge.c:626 src/msgunfmt.c:534
+#: src/msgfmt.c:1076 src/msgmerge.c:626 src/msgunfmt.c:534
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               顯示詳細資訊\n"
 
-#: src/msgfmt.c:1199
+#: src/msgfmt.c:1189
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：缺少了 PO 檔的標頭或是格�無效\n"
 
-#: src/msgfmt.c:1202
+#: src/msgfmt.c:1192
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字元集轉�的功能�會生效\n"
 
-#: src/msgfmt.c:1212
+#: src/msgfmt.c:1202
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 檔的標頭�然是模糊狀態\n"
 
-#: src/msgfmt.c:1214
+#: src/msgfmt.c:1204
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "警告：較舊版本的 msgfmt �到此檔案時會�出錯誤訊�\n"
 
-#: src/msgfmt.c:1238
+#: src/msgfmt.c:1228
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "領域�稱 %s ���作為檔案�稱"
 
-#: src/msgfmt.c:1243
+#: src/msgfmt.c:1233
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "領域�稱 %s ���作為檔案�稱：將使用字首"
 
-#: src/msgfmt.c:1257
+#: src/msgfmt.c:1247
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "忽略‘domain %s’指令"
 
-#: src/msgfmt.c:1317
+#: src/msgfmt.c:1307
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "忽略空的‘msgstr’欄�"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1308
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "忽略模糊的‘msgstr’欄�"
 
-#: src/msgfmt.c:1367
+#: src/msgfmt.c:1357
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：原始檔包�模糊翻譯�目"
 
-#: src/msgfmt.c:1484
+#: src/msgfmt.c:1474
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1491
+#: src/msgfmt.c:1481
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
 
-#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:88
-#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:140
-#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:146 src/x-java.c:181
-#: src/x-javascript.c:172 src/x-librep.c:148 src/x-lisp.c:213 src/x-lua.c:173
-#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:164
-#: src/x-python.c:177 src/x-rst.c:234 src/x-scheme.c:171 src/x-sh.c:155
-#: src/x-smalltalk.c:92 src/x-tcl.c:151 src/x-vala.c:176 src/x-ycp.c:92
+#: src/msggrep.c:259 src/po-lex.c:657 src/read-desktop.c:127 src/read-mo.c:87
+#: src/read-properties.c:90 src/read-stringtable.c:99 src/x-awk.c:139
+#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:181
+#: src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:173
+#: src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163
+#: src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155
+#: src/x-smalltalk.c:92 src/x-tcl.c:150 src/x-vala.c:176 src/x-ycp.c:92
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "讀� %s 時出�錯誤"
@@ -2547,12 +2546,12 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "%s 套件的傳統字漢語翻譯"
 
-#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:248
+#: src/msgl-cat.c:178 src/msgl-charset.c:87 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "目�的字元集編碼 %s �是通用的編碼�稱"
 
-#: src/msgl-cat.c:189 src/msgl-iconv.c:260
+#: src/msgl-cat.c:189 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "輸入檔有兩種��的字元集編碼 %s 和 “%s�"
@@ -2570,14 +2569,14 @@ msgid ""
 "charset specification"
 msgstr "輸入檔 ‘%2$s’ 的 domain “%1$s� 的標頭欄�中沒有指定字元集"
 
-#: src/msgl-cat.c:394 src/msgl-iconv.c:376
+#: src/msgl-cat.c:394 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "目標的字元集編碼 %s �是通用的編碼�稱。"
 
 #: src/msgl-cat.c:445 src/msgl-cat.c:451 src/msgl-charset.c:93
 #: src/msgl-charset.c:128 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:578 src/xgettext.c:3739
+#: src/xgettext.c:579 src/xgettext.c:3729
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2662,75 +2661,75 @@ msgstr ""
 "‘%s’ 的輸出�能有誤。\n"
 "設定 LC_ALL=C 是一個�行的解決方法。\n"
 
-#: src/msgl-check.c:135
+#: src/msgl-check.c:134
 msgid "plural expression can produce negative values"
 msgstr "複數表示��能產生負數"
 
-#: src/msgl-check.c:146
+#: src/msgl-check.c:145
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "nplurals = %lu，但複數表示�的最大值�能等於 %lu"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:191
 msgid "plural expression can produce division by zero"
 msgstr "複數表示�會引致被 0 整除的錯誤"
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:196
 msgid "plural expression can produce integer overflow"
 msgstr "複數表示�會引致整數溢�的錯誤"
 
-#: src/msgl-check.c:202
+#: src/msgl-check.c:201
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "複數表示�會引致�算錯誤，例如被 0 整除"
 
-#: src/msgl-check.c:271
+#: src/msgl-check.c:270
 #, fuzzy, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "嘗試使用下列 %s 中屬於�法的型態:\n"
 
-#: src/msgl-check.c:363 src/msgl-check.c:387
+#: src/msgl-check.c:362 src/msgl-check.c:386
 #, fuzzy
 msgid "message catalog has plural form translations"
 msgstr "翻譯檔�有複數型態的翻譯..."
 
-#: src/msgl-check.c:365
+#: src/msgl-check.c:364
 #, fuzzy
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...但檔頭缺少了� “plural=表示�� 的項目"
 
-#: src/msgl-check.c:389
+#: src/msgl-check.c:388
 #, fuzzy
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...但檔頭缺少了� “nplurals=整數� 的項目"
 
-#: src/msgl-check.c:425
+#: src/msgl-check.c:424
 msgid "invalid nplurals value"
 msgstr "無效的 nplurals 值"
 
-#: src/msgl-check.c:447
+#: src/msgl-check.c:446
 msgid "invalid plural expression"
 msgstr "無效的複數表示�"
 
-#: src/msgl-check.c:477 src/msgl-check.c:493
+#: src/msgl-check.c:476 src/msgl-check.c:492
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu..."
 
-#: src/msgl-check.c:479
+#: src/msgl-check.c:478
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "...但�些訊��有 %lu 種複數型態"
 
-#: src/msgl-check.c:495
+#: src/msgl-check.c:494
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "...但�些訊�有 %lu 種複數型態"
 
-#: src/msgl-check.c:519
+#: src/msgl-check.c:518
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2738,93 +2737,98 @@ msgstr ""
 "翻譯檔�有複數型態的翻譯，但缺少了以下的標頭欄�：\n"
 "“Plural-Forms: nplurals=<整數>; plural=<表示�>;�"
 
-#: src/msgl-check.c:616
+#: src/msgl-check.c:615
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' 和 `msgid_plural' 欄�並��時以 '\\n' 開始"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:623
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "‘msgid’和‘msgstr[%u]’欄�並��時以‘\\n’開始"
 
-#: src/msgl-check.c:639
+#: src/msgl-check.c:638
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
 msgstr "‘msgid’和‘msgstr’欄�並��時以‘\\n’開始"
 
-#: src/msgl-check.c:657
+#: src/msgl-check.c:656
 #, fuzzy
 msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgid_plural’欄�並��時以‘\\n’��"
 
-#: src/msgl-check.c:665
+#: src/msgl-check.c:664
 #, fuzzy, c-format
 msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgstr[%u]’欄�並��時以‘\\n’��"
 
-#: src/msgl-check.c:680
+#: src/msgl-check.c:679
 #, fuzzy
 msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
 msgstr "‘msgid’和‘msgstr’欄�並��時以‘\\n’��"
 
-#: src/msgl-check.c:692
+#: src/msgl-check.c:691
 msgid "plural handling is a GNU gettext extension"
 msgstr "複數處�是 GNU gettext 的擴展功能"
 
-#: src/msgl-check.c:734
+#: src/msgl-check.c:733
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少了�徑�標記‘%c’"
 
-#: src/msgl-check.c:745
+#: src/msgl-check.c:744
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr �有�多的�徑�標記‘%c’"
 
-#: src/msgl-check.c:819
+#: src/msgl-check.c:818
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "�些標頭欄��然是�設值\n"
 
-#: src/msgl-check.c:836
+#: src/msgl-check.c:835
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "缺少了標頭欄�‘%s’\n"
 
-#: src/msgl-check.c:941
+#: src/msgl-check.c:940
 msgid "ASCII ellipsis ('...') instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1014
+#: src/msgl-check.c:1013
 msgid "space before ellipsis found in user visible strings"
 msgstr ""
 
-#: src/msgl-check.c:1043
+#: src/msgl-check.c:1042
 msgid "ASCII double quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-check.c:1049
+#: src/msgl-check.c:1048
 msgid "ASCII single quote used instead of Unicode"
 msgstr ""
 
-#: src/msgl-iconv.c:66
+#: src/msgl-check.c:1163
+#, c-format
+msgid "ASCII bullet ('%c') instead of Unicode"
+msgstr ""
+
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
-#: src/msgl-iconv.c:70
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "當開啟檔案 %s 準備讀�時發生錯誤"
 
-#: src/msgl-iconv.c:291
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "輸入檔沒有指定字元集的標頭欄�"
 
-#: src/msgl-iconv.c:306 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
-#: src/xgettext.c:813 src/x-python.c:666
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:289 src/recode-sr-latin.c:294
+#: src/xgettext.c:800 src/x-python.c:665
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2833,7 +2837,7 @@ msgstr ""
 "�支�將字元集由 %s 轉�至 “%s�。%s 需� iconv()，但 iconv() �支�此種轉�方"
 "�。"
 
-#: src/msgl-iconv.c:336
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2841,8 +2845,8 @@ msgid ""
 msgstr ""
 "由 %s 轉�至 %s 會產生�複訊�：有些本來��的 msgid 轉�後會變�相�。"
 
-#: src/msgl-iconv.c:342 src/recode-sr-latin.c:303 src/xgettext.c:820
-#: src/x-python.c:673
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:303 src/xgettext.c:807
+#: src/x-python.c:672
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3253,7 +3257,7 @@ msgstr "字串中間�然斷行"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:325 src/xgettext.c:1251
+#: src/read-catalog.c:325 src/xgettext.c:1241
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此檔案�能�有 domain 指令"
@@ -3275,32 +3279,32 @@ msgstr ""
 msgid "invalid non-blank character"
 msgstr ""
 
-#: src/read-desktop.c:403
+#: src/read-desktop.c:405
 #, fuzzy, c-format
 msgid "missing '=' after \"%s\""
 msgstr "未指定�濾器"
 
-#: src/read-desktop.c:466
+#: src/read-desktop.c:468
 #, fuzzy
 msgid "invalid non-blank line"
 msgstr "無效的 nplurals 值"
 
-#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:184
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:167 src/read-mo.c:183
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "檔案 %s 被截斷了"
 
-#: src/read-mo.c:133
+#: src/read-mo.c:132
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "檔案 %s 包�並�以 NUL 為�尾的字串"
 
-#: src/read-mo.c:176 src/read-mo.c:284
+#: src/read-mo.c:175 src/read-mo.c:283
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "檔案 %s 並� GNU .mo 格�檔案"
 
-#: src/read-mo.c:190
+#: src/read-mo.c:189
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "檔案 %s 在 %s 包�並�以 NUL 為�尾的字串"
@@ -3481,24 +3485,24 @@ msgstr "編譯 C# class 檔出�錯誤，請嘗試使用 --verbose �項"
 msgid "compilation of C# class failed"
 msgstr "編譯 C# class 檔出�錯誤，請嘗試使用 --verbose �項"
 
-#: src/write-desktop.c:162 src/write-mo.c:800 src/write-qt.c:737
+#: src/write-desktop.c:162 src/write-mo.c:799 src/write-qt.c:737
 #: src/write-tcl.c:213
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "當開啟檔案 %s 來寫入內容時發生錯誤"
 
-#: src/write-java.c:1092
+#: src/write-java.c:1091
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "並�有效的 Java class �稱：%s"
 
-#: src/write-java.c:1211
+#: src/write-java.c:1210
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "編譯 Java class 檔出�錯誤，請嘗試使用 --verbose �項或設定 $JAVAC 環境變數"
 
-#: src/write-java.c:1214
+#: src/write-java.c:1213
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3598,12 +3602,12 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "翻譯檔�有複數型態的翻譯，但 Tcl 的翻譯檔�能處�複數型態\n"
 
-#: src/x-awk.c:342 src/x-javascript.c:796 src/x-python.c:932
+#: src/x-awk.c:341 src/x-javascript.c:796 src/x-python.c:931
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: 警告：字串未完�"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 警告：正�表示��完整"
@@ -3623,7 +3627,7 @@ msgstr "%s:%d: 警告：字元常數未完�"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: 警告：字串未完�"
 
-#: src/x-csharp.c:225 src/xgettext.c:2375
+#: src/x-csharp.c:225 src/xgettext.c:2365
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3666,7 +3670,7 @@ msgstr ""
 "%s:%d: 該行末端出��完整的�元組�列。\n"
 "請使用 --from-code �項指定�代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:375
+#: src/x-csharp.c:316 src/x-javascript.c:322 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 失敗"
@@ -3680,7 +3684,7 @@ msgstr ""
 "%s:%d: 出�無效的�元組�列。\n"
 "請使用 --from-code �項指定�代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:1391 src/x-python.c:1139
+#: src/x-csharp.c:1391 src/x-python.c:1138
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: 警告：Unicode 字元無效"
@@ -3700,53 +3704,53 @@ msgstr "%s:%d: 應該有 ‘)’ 的地方出�了 ‘}’"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 應該有 ‘}’ 的地方出�了 ‘)’"
 
-#: src/xgettext.c:579
+#: src/xgettext.c:580
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:651
 #, fuzzy, c-format
 msgid "syntax check '%s' unknown"
 msgstr "�明的語言 ‘%s’"
 
-#: src/xgettext.c:657
+#: src/xgettext.c:660
 #, c-format
 msgid "sentence end type '%s' unknown"
 msgstr ""
 
-#: src/xgettext.c:711
+#: src/xgettext.c:714
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "當�果被導�至標準輸出時，��以用 --join-existing �項"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:719
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "若無關�字，xgettext 將無法�作"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:855
 #, c-format
 msgid "warning: ITS rule file '%s' does not exist"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:936
 #, c-format
 msgid ""
 "warning: ITS rule file '%s' does not exist; check your gettext installation"
 msgstr ""
 
-#: src/xgettext.c:967
+#: src/xgettext.c:954
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "警告：無法辨�檔案 ‘%s’ 的副檔� ‘%s’；會�設是 C 格�來處�"
 
-#: src/xgettext.c:1052
+#: src/xgettext.c:1040
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "由指定的輸入檔抽��翻譯的字串。\n"
 
-#: src/xgettext.c:1075
+#: src/xgettext.c:1063
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3754,23 +3758,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME   使用 NAME.po 作為輸出檔 (而�是 messages.po)\n"
 
-#: src/xgettext.c:1077
+#: src/xgettext.c:1065
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           將輸出內容寫入至指定檔案\n"
 
-#: src/xgettext.c:1079
+#: src/xgettext.c:1067
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DIR        輸出檔會存�在指定目錄\n"
 
-#: src/xgettext.c:1084
+#: src/xgettext.c:1072
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "輸入檔的語言�擇：\n"
 
-#: src/xgettext.c:1086
+#: src/xgettext.c:1074
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3790,19 +3794,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:1093
+#: src/xgettext.c:1081
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的簡寫\n"
 
-#: src/xgettext.c:1095
+#: src/xgettext.c:1083
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "�設的語言是由輸入檔的延伸檔�決定的。\n"
 
-#: src/xgettext.c:1100
+#: src/xgettext.c:1088
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3811,22 +3815,22 @@ msgstr ""
 "      --from-code=NAME        輸入檔的文字編碼\n"
 "                                (Python, Tcl, Glade 例外)\n"
 
-#: src/xgettext.c:1103
+#: src/xgettext.c:1091
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "輸入檔內容�設會當作 ASCII 看待。\n"
 
-#: src/xgettext.c:1108
+#: src/xgettext.c:1096
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         �併已存在的訊�檔\n"
 
-#: src/xgettext.c:1110
+#: src/xgettext.c:1098
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  ��出屬於 FILE.po 的訊�\n"
 
-#: src/xgettext.c:1112
+#: src/xgettext.c:1100
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3836,15 +3840,15 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:1117
+#: src/xgettext.c:1105
 #, c-format
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
-#: src/xgettext.c:1121
+#: src/xgettext.c:1109
 #, c-format
 msgid ""
 "      --sentence-end=TYPE     type describing the end of sentence\n"
@@ -3852,17 +3856,17 @@ msgid ""
 "                                 or double-space)\n"
 msgstr ""
 
-#: src/xgettext.c:1126
+#: src/xgettext.c:1114
 #, c-format
 msgid "Language specific options:\n"
 msgstr "個別語言特殊�項：\n"
 
-#: src/xgettext.c:1128
+#: src/xgettext.c:1116
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           抽�所有字串\n"
 
-#: src/xgettext.c:1130
+#: src/xgettext.c:1118
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3876,7 +3880,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:1138
+#: src/xgettext.c:1126
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3890,7 +3894,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:1143
+#: src/xgettext.c:1131
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3898,7 +3902,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:1146
+#: src/xgettext.c:1134
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3912,63 +3916,68 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:1151
+#: src/xgettext.c:1139
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             支�讀�輸入內容中的 ANSI C trigraph\n"
 
-#: src/xgettext.c:1153
+#: src/xgettext.c:1141
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (��用於 C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:1155
+#: src/xgettext.c:1143
+#, fuzzy, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr "  -f, --files-from=FILE       由 FILE 讀�所有輸入檔的�置\n"
+
+#: src/xgettext.c:1145
+#, fuzzy, c-format
+msgid "                                (only XML based languages)\n"
+msgstr "                                (��用於 C++)\n"
+
+#: src/xgettext.c:1147
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    辨� Qt 格�的字串\n"
 
-#: src/xgettext.c:1157 src/xgettext.c:1161 src/xgettext.c:1165
+#: src/xgettext.c:1149 src/xgettext.c:1153 src/xgettext.c:1157
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (��用於 C++)\n"
 
-#: src/xgettext.c:1159
+#: src/xgettext.c:1151
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    辨� Qt 格�的字串\n"
 
-#: src/xgettext.c:1163
+#: src/xgettext.c:1155
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    辨� Qt 格�的字串\n"
 
-#: src/xgettext.c:1167
+#: src/xgettext.c:1159
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 顯示較詳細的格�字串辨��果\n"
 
-#: src/xgettext.c:1192
+#: src/xgettext.c:1184
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     輸出檔格�為 Java .properties 檔\n"
 
-#: src/xgettext.c:1196
-#, fuzzy, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr "  -f, --files-from=FILE       由 FILE 讀�所有輸入檔的�置\n"
-
-#: src/xgettext.c:1198
+#: src/xgettext.c:1188
 #, fuzzy, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr "      --indent                將輸出�果進行縮排\n"
 
-#: src/xgettext.c:1211
+#: src/xgettext.c:1201
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:1213
+#: src/xgettext.c:1203
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3976,24 +3985,24 @@ msgstr ""
 "      --foreign-user          輸出檔�加上 FSF 的版權宣告，�用於 FSF 以外的"
 "專案\n"
 
-#: src/xgettext.c:1215
+#: src/xgettext.c:1205
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1217
+#: src/xgettext.c:1207
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:1219
+#: src/xgettext.c:1209
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  指定匯報 msgid �題時的郵件地�\n"
 
-#: src/xgettext.c:1221
+#: src/xgettext.c:1211
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4001,7 +4010,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1224
+#: src/xgettext.c:1214
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4009,52 +4018,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:2050
+#: src/xgettext.c:2040
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:2175
+#: src/xgettext.c:2165
 msgid "standard input"
 msgstr "標準輸入"
 
-#: src/xgettext.c:2340
+#: src/xgettext.c:2330
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2344
+#: src/xgettext.c:2334
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2349
+#: src/xgettext.c:2339
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2455 src/xgettext.c:2488 src/xgettext.c:2553
+#: src/xgettext.c:2445 src/xgettext.c:2478 src/xgettext.c:2543
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 警告："
 
-#: src/xgettext.c:2458
+#: src/xgettext.c:2448
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2459
+#: src/xgettext.c:2449
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr "縱使表�上 %s 宣告了是 %s 格�字串，但實際上�是。原因為：%s\n"
 
-#: src/xgettext.c:2490
+#: src/xgettext.c:2480
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4063,7 +4072,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2555
+#: src/xgettext.c:2545
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4073,27 +4082,27 @@ msgstr ""
 "gettext(\"\") 會回傳檔案開始部份的資訊，\n"
 "並�空白字串。\n"
 
-#: src/xgettext.c:3292
+#: src/xgettext.c:3282
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "%2$s 的引數 %1$s �明確"
 
-#: src/xgettext.c:3319
+#: src/xgettext.c:3309
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3344
+#: src/xgettext.c:3334
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3365
+#: src/xgettext.c:3355
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3740
+#: src/xgettext.c:3730
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4106,7 +4115,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS 變數；�則請在指令中\n"
 "使用 --msgid-bugs-address �項。\n"
 
-#: src/xgettext.c:3958
+#: src/xgettext.c:3948
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "�明的語言 ‘%s’"
@@ -4218,13 +4227,13 @@ msgstr "%s:%d: 8bit 字元 “%c� 的轉� (“\\L�) 無效"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c� 的轉� (“\\U�) 無效"
 
-#: src/x-python.c:279
+#: src/x-python.c:278
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:325
+#: src/x-python.c:324
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4234,7 +4243,7 @@ msgstr ""
 "%s:%d: 出�無效的�元組�列。\n"
 "請使用 --from-code �項指定�代碼的正確文字編碼。\n"
 
-#: src/x-python.c:342
+#: src/x-python.c:341
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4244,7 +4253,7 @@ msgstr ""
 "%s:%d: 出�無效而且�分長的�元組�列。\n"
 "請使用 --from-code �項指定�代碼的正確文字編碼。\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4254,7 +4263,7 @@ msgstr ""
 "%s:%d: 檔案末端出��完整的�元組�列。\n"
 "請使用 --from-code �項指定�代碼的正確文字編碼。\n"
 
-#: src/x-python.c:365
+#: src/x-python.c:364
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4264,7 +4273,7 @@ msgstr ""
 "%s:%d: 該行末端出��完整的�元組�列。\n"
 "請使用 --from-code �項指定�代碼的正確文字編碼。\n"
 
-#: src/x-python.c:398
+#: src/x-python.c:397
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4274,22 +4283,22 @@ msgstr ""
 "%s:%d: 出�無效的�元組�列。\n"
 "請使用 --from-code �項指定�代碼的正確文字編碼。\n"
 
-#: src/x-python.c:723
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: 無效的字串定義"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # 後缺少了數字"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: 無效的字串表示�"
diff --git a/gettext-tools/projects/Makefile.am b/gettext-tools/projects/Makefile.am
index 628af62..7945081 100644
--- a/gettext-tools/projects/Makefile.am
+++ b/gettext-tools/projects/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/projects subdirectory of GNU gettext
-## Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+## Copyright (C) 2001-2003, 2006, 2015-2016 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
diff --git a/gettext-tools/projects/Makefile.in b/gettext-tools/projects/Makefile.in
index c8a69cc..3fa3310 100644
--- a/gettext-tools/projects/Makefile.in
+++ b/gettext-tools/projects/Makefile.in
@@ -117,6 +117,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -153,6 +154,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 7109072..0538d1e 100644
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gettext-tools/src subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2011, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 1995-1998, 2000-2011, 2015-2016 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
@@ -40,7 +39,7 @@ read-po.h read-properties.h read-stringtable.h \
 str-list.h \
 color.h write-catalog.h write-po.h write-properties.h write-stringtable.h \
 dir-list.h file-list.h po-gram-gen.h po-gram-gen2.h cldr-plural.h \
-cldr-plural-exp.h locating-rule.h its.h \
+cldr-plural-exp.h locating-rule.h its.h search-path.h \
 msgl-charset.h msgl-equal.h msgl-iconv.h msgl-ascii.h msgl-cat.h msgl-header.h \
 msgl-english.h msgl-check.h msgl-fsearch.h msgfmt.h msgunfmt.h \
 plural-count.h plural-eval.h plural-distrib.h \
@@ -154,7 +153,7 @@ msgl-ascii.c msgl-iconv.c msgl-equal.c msgl-cat.c msgl-header.c msgl-english.c \
 msgl-check.c file-list.c msgl-charset.c po-time.c plural-exp.c plural-eval.c \
 plural-table.c quote.h sentence.h sentence.c \
 $(FORMAT_SOURCE) \
-read-desktop.c locating-rule.c its.c
+read-desktop.c locating-rule.c its.c search-path.c
 
 # msggrep needs pattern matching.
 LIBGREP = ../libgrep/libgrep.a
@@ -256,6 +255,11 @@ libgettextsrc_la_LDFLAGS = \
   -release @VERSION@ \
   ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
 
+# OS/2 does not support a DLL name longer than 8 characters.
+if OS2
+libgettextsrc_la_LDFLAGS += -os2dllname gtsrc
+endif
+
 libgettextsrc_la_CPPFLAGS = $(AM_CPPFLAGS) $(INCXML)
 
 # Tell the mingw or Cygwin linker which symbols to export.
diff --git a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
index 00da903..5b2c785 100644
--- a/gettext-tools/src/Makefile.in
+++ b/gettext-tools/src/Makefile.in
@@ -96,11 +96,14 @@ bin_PROGRAMS = msgcmp$(EXEEXT) msgfmt$(EXEEXT) msgmerge$(EXEEXT) \
 noinst_PROGRAMS = hostname$(EXEEXT) urlget$(EXEEXT) \
 	cldr-plurals$(EXEEXT)
 
+# OS/2 does not support a DLL name longer than 8 characters.
+@OS2_TRUE@am__append_1 = -os2dllname gtsrc
+
 # Tell the mingw or Cygwin linker which symbols to export.
-@WOE32DLL_TRUE@am__append_1 = ../woe32dll/gettextsrc-exports.c
-@WOE32DLL_TRUE@am__append_2 = -Wl,--export-all-symbols
-@WOE32DLL_TRUE@am__append_3 = $(GETTEXTLIB_EXPORTS_FLAGS)
-@WOE32_TRUE@am__append_4 = gettext.res
+@WOE32DLL_TRUE@am__append_2 = ../woe32dll/gettextsrc-exports.c
+@WOE32DLL_TRUE@am__append_3 = -Wl,--export-all-symbols
+@WOE32DLL_TRUE@am__append_4 = $(GETTEXTLIB_EXPORTS_FLAGS)
+@WOE32_TRUE@am__append_5 = gettext.res
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -133,6 +136,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -169,6 +173,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
@@ -417,7 +422,7 @@ am__libgettextsrc_la_SOURCES_DIST = message.c po-error.c po-xerror.c \
 	format-qt-plural.c format-kde.c format-kde-kuit.c \
 	format-boost.c format-lua.c format-javascript.c \
 	../woe32dll/c++format.cc read-desktop.c locating-rule.c its.c \
-	../woe32dll/gettextsrc-exports.c
+	search-path.c ../woe32dll/gettextsrc-exports.c
 am__objects_1 = libgettextsrc_la-message.lo \
 	libgettextsrc_la-po-error.lo libgettextsrc_la-po-xerror.lo \
 	libgettextsrc_la-read-catalog-abstract.lo \
@@ -499,7 +504,7 @@ am_libgettextsrc_la_OBJECTS = $(am__objects_1) \
 	libgettextsrc_la-plural-table.lo libgettextsrc_la-sentence.lo \
 	$(am__objects_2) libgettextsrc_la-read-desktop.lo \
 	libgettextsrc_la-locating-rule.lo libgettextsrc_la-its.lo \
-	$(am__objects_3)
+	libgettextsrc_la-search-path.lo $(am__objects_3)
 libgettextsrc_la_OBJECTS = $(am_libgettextsrc_la_OBJECTS)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_cldr_plurals_OBJECTS = cldr_plurals-cldr-plural.$(OBJEXT) \
@@ -2163,7 +2168,7 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies subdir-objects
 # Special rules for Tcl auxiliary program.
 EXTRA_DIST = FILES project-id gnu/gettext/DumpResource.java \
 	gnu/gettext/GetURL.java msgfmt.cs msgunfmt.cs msgunfmt.tcl
-MOSTLYCLEANFILES = core *.stackdump $(am__append_4)
+MOSTLYCLEANFILES = core *.stackdump $(am__append_5)
 CLEANFILES = gnu.gettext.DumpResource$(EXEEXT) \
 	gnu.gettext.GetURL$(EXEEXT) gettext.jar gnu/gettext/*.class \
 	msgfmt.net.exe msgfmt.net.exe.mdb msgunfmt.net.exe \
@@ -2177,7 +2182,7 @@ read-po.h read-properties.h read-stringtable.h \
 str-list.h \
 color.h write-catalog.h write-po.h write-properties.h write-stringtable.h \
 dir-list.h file-list.h po-gram-gen.h po-gram-gen2.h cldr-plural.h \
-cldr-plural-exp.h locating-rule.h its.h \
+cldr-plural-exp.h locating-rule.h its.h search-path.h \
 msgl-charset.h msgl-equal.h msgl-iconv.h msgl-ascii.h msgl-cat.h msgl-header.h \
 msgl-english.h msgl-check.h msgl-fsearch.h msgfmt.h msgunfmt.h \
 plural-count.h plural-eval.h plural-distrib.h \
@@ -2258,7 +2263,8 @@ libgettextsrc_la_SOURCES = $(COMMON_SOURCE) read-catalog.c color.c \
 	msgl-header.c msgl-english.c msgl-check.c file-list.c \
 	msgl-charset.c po-time.c plural-exp.c plural-eval.c \
 	plural-table.c quote.h sentence.h sentence.c $(FORMAT_SOURCE) \
-	read-desktop.c locating-rule.c its.c $(am__append_1)
+	read-desktop.c locating-rule.c its.c search-path.c \
+	$(am__append_2)
 
 # msggrep needs pattern matching.
 LIBGREP = ../libgrep/libgrep.a
@@ -2329,8 +2335,8 @@ cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
 # use iconv().
 libgettextsrc_la_LDFLAGS = -release @VERSION@ \
 	../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ \
-	@LTLIBICONV@ -lc -no-undefined $(am__append_2)
-libgettextsrc_la_CPPFLAGS = $(AM_CPPFLAGS) $(INCXML) $(am__append_3)
+	@LTLIBICONV@ -lc -no-undefined $(am__append_1) $(am__append_3)
+libgettextsrc_la_CPPFLAGS = $(AM_CPPFLAGS) $(INCXML) $(am__append_4)
 
 # Compile-time flags for particular source files.
 msgmerge_CFLAGS = $(AM_CFLAGS) $(OPENMP_CFLAGS)
@@ -3008,6 +3014,9 @@ libgettextsrc_la-locating-rule.lo: locating-rule.c
 libgettextsrc_la-its.lo: its.c
 	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgettextsrc_la-its.lo `test -f 'its.c' || echo '$(srcdir)/'`its.c
 
+libgettextsrc_la-search-path.lo: search-path.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgettextsrc_la-search-path.lo `test -f 'search-path.c' || echo '$(srcdir)/'`search-path.c
+
 ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo: ../woe32dll/gettextsrc-exports.c
 	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgettextsrc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../woe32dll/libgettextsrc_la-gettextsrc-exports.lo `test -f '../woe32dll/gettextsrc-exports.c' || echo '$(srcdir)/'`../woe32dll/gettextsrc-exports.c
 
diff --git a/gettext-tools/src/cldr-plural-exp.c b/gettext-tools/src/cldr-plural-exp.c
index e55b26d..c4554f3 100644
--- a/gettext-tools/src/cldr-plural-exp.c
+++ b/gettext-tools/src/cldr-plural-exp.c
@@ -1,5 +1,5 @@
 /* Unicode CLDR plural rule parser and converter
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
diff --git a/gettext-tools/src/cldr-plural-exp.h b/gettext-tools/src/cldr-plural-exp.h
index 84c8a73..8f69bb8 100644
--- a/gettext-tools/src/cldr-plural-exp.h
+++ b/gettext-tools/src/cldr-plural-exp.h
@@ -1,5 +1,5 @@
 /* Unicode CLDR plural rule parser and converter
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
diff --git a/gettext-tools/src/cldr-plural.y b/gettext-tools/src/cldr-plural.y
index d3128cd..6b2824d 100644
--- a/gettext-tools/src/cldr-plural.y
+++ b/gettext-tools/src/cldr-plural.y
@@ -1,5 +1,5 @@
 /* Unicode CLDR plural rule parser and converter
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
diff --git a/gettext-tools/src/cldr-plurals.c b/gettext-tools/src/cldr-plurals.c
index abbd0c2..56c4581 100644
--- a/gettext-tools/src/cldr-plurals.c
+++ b/gettext-tools/src/cldr-plurals.c
@@ -1,5 +1,5 @@
 /* Unicode CLDR plural rule parser and converter
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
diff --git a/gettext-tools/src/color.c b/gettext-tools/src/color.c
index b372b2e..7e3d146 100644
--- a/gettext-tools/src/color.c
+++ b/gettext-tools/src/color.c
@@ -1,5 +1,5 @@
 /* Color and styling handling.
-   Copyright (C) 2006-2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/color.h b/gettext-tools/src/color.h
index 25211ac..14bbaf9 100644
--- a/gettext-tools/src/color.h
+++ b/gettext-tools/src/color.h
@@ -1,5 +1,5 @@
 /* Color and styling handling.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/dir-list.c b/gettext-tools/src/dir-list.c
index 2ab0fd2..09f7f92 100644
--- a/gettext-tools/src/dir-list.c
+++ b/gettext-tools/src/dir-list.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1996, 1998, 2000-2002, 2006, 2015 Free Software
+   Copyright (C) 1996, 1998, 2000-2002, 2006, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/dir-list.h b/gettext-tools/src/dir-list.h
index 954e017..d21ca60 100644
--- a/gettext-tools/src/dir-list.h
+++ b/gettext-tools/src/dir-list.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1996, 1998, 2000-2003, 2015 Free Software Foundation,
+   Copyright (C) 1996, 1998, 2000-2003, 2015-2016 Free Software Foundation,
    Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/file-list.c b/gettext-tools/src/file-list.c
index c60f6a0..02ce000 100644
--- a/gettext-tools/src/file-list.c
+++ b/gettext-tools/src/file-list.c
@@ -1,5 +1,5 @@
 /* Reading file lists.
-   Copyright (C) 1995-1998, 2000-2002, 2007, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2007, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/file-list.h b/gettext-tools/src/file-list.h
index a43f6a4..fc98d29 100644
--- a/gettext-tools/src/file-list.h
+++ b/gettext-tools/src/file-list.h
@@ -1,5 +1,5 @@
 /* Reading file lists.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/filter-quote.c b/gettext-tools/src/filter-quote.c
index 25ac391..23967a2 100644
--- a/gettext-tools/src/filter-quote.c
+++ b/gettext-tools/src/filter-quote.c
@@ -1,5 +1,5 @@
 /* Convert ASCII quotations to Unicode quotations.
-   Copyright (C) 2014-2015 Free Software Foundation, Inc.
+   Copyright (C) 2014-2016 Free Software Foundation, Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2014.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/filter-sr-latin.c b/gettext-tools/src/filter-sr-latin.c
index ea5457f..632ed8d 100644
--- a/gettext-tools/src/filter-sr-latin.c
+++ b/gettext-tools/src/filter-sr-latin.c
@@ -1,5 +1,5 @@
 /* Recode Serbian text from Cyrillic to Latin script.
-   Copyright (C) 2006-2007, 2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009, 2015-2016 Free Software Foundation, Inc.
    Written by Danilo Å egan <danilo@gnome.org>, 2006,
    and Bruno Haible <bruno@clisp.org>, 2006.
 
diff --git a/gettext-tools/src/format-awk.c b/gettext-tools/src/format-awk.c
index efaa2d7..0142649 100644
--- a/gettext-tools/src/format-awk.c
+++ b/gettext-tools/src/format-awk.c
@@ -1,5 +1,5 @@
 /* awk format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
diff --git a/gettext-tools/src/format-boost.c b/gettext-tools/src/format-boost.c
index a390078..f079f9f 100644
--- a/gettext-tools/src/format-boost.c
+++ b/gettext-tools/src/format-boost.c
@@ -1,5 +1,5 @@
 /* Boost format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2006.
 
diff --git a/gettext-tools/src/format-c-parse.h b/gettext-tools/src/format-c-parse.h
index 4918fd5..e90e5fd 100644
--- a/gettext-tools/src/format-c-parse.h
+++ b/gettext-tools/src/format-c-parse.h
@@ -1,5 +1,5 @@
 /* Parsing C format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2010, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009-2010, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/format-c.c b/gettext-tools/src/format-c.c
index b2dc9dc..6ccc8e4 100644
--- a/gettext-tools/src/format-c.c
+++ b/gettext-tools/src/format-c.c
@@ -1,5 +1,5 @@
 /* C format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/format-csharp.c b/gettext-tools/src/format-csharp.c
index 1f5e715..7a593b1 100644
--- a/gettext-tools/src/format-csharp.c
+++ b/gettext-tools/src/format-csharp.c
@@ -1,5 +1,5 @@
 /* C# format strings.
-   Copyright (C) 2003-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2003-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/format-elisp.c b/gettext-tools/src/format-elisp.c
index 2eb99ac..1300c1c 100644
--- a/gettext-tools/src/format-elisp.c
+++ b/gettext-tools/src/format-elisp.c
@@ -1,5 +1,5 @@
 /* Emacs Lisp format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
diff --git a/gettext-tools/src/format-gcc-internal.c b/gettext-tools/src/format-gcc-internal.c
index f5ca5e8..797756b 100644
--- a/gettext-tools/src/format-gcc-internal.c
+++ b/gettext-tools/src/format-gcc-internal.c
@@ -1,5 +1,5 @@
 /* GCC internal format strings.
-   Copyright (C) 2003-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/format-gfc-internal.c b/gettext-tools/src/format-gfc-internal.c
index 1932c17..5965ab7 100644
--- a/gettext-tools/src/format-gfc-internal.c
+++ b/gettext-tools/src/format-gfc-internal.c
@@ -1,5 +1,5 @@
 /* GFC (GNU Fortran Compiler) internal format strings.
-   Copyright (C) 2003-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/format-invalid.h b/gettext-tools/src/format-invalid.h
index ed6c501..1a4517e 100644
--- a/gettext-tools/src/format-invalid.h
+++ b/gettext-tools/src/format-invalid.h
@@ -1,5 +1,5 @@
 /* Common reasons that make a format string invalid.
-   Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/format-java.c b/gettext-tools/src/format-java.c
index a69c84f..e2b271e 100644
--- a/gettext-tools/src/format-java.c
+++ b/gettext-tools/src/format-java.c
@@ -1,5 +1,5 @@
 /* Java format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/format-javascript.c b/gettext-tools/src/format-javascript.c
index fa39e20..42f2dce 100644
--- a/gettext-tools/src/format-javascript.c
+++ b/gettext-tools/src/format-javascript.c
@@ -1,5 +1,5 @@
 /* JavaScript format strings.
-   Copyright (C) 2001-2004, 2006-2009, 2013, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2009, 2013, 2015-2016 Free Software
    Foundation, Inc.
    Written by Andreas Stricker <andy@knitter.ch>, 2010.
    It's based on python format module from Bruno Haible.
@@ -34,15 +34,15 @@
 
 #define _(str) gettext (str)
 
-/* Although JavaScript specification itself does not define any format
-   strings, many implementations provide printf-like functions.
-   We provide a permissive parser which accepts commonly used format
-   strings, where:
+/* JavaScript format strings are not in the language specification,
+   but there are several implementations which provide the printf-like
+   feature.  Here, we provide a permissive parser which at least accepts
+   format strings supported by Gjs version 1.40, where:
 
    A directive
-   - starts with '%',
+   - starts with '%' or '%m$' where m is a positive integer,
    - is optionally followed by any of the characters '0', '-', ' ',
-     or, each of which acts as a flag,
+     or 'I', each of which acts as a flag,
    - is optionally followed by a width specification: a nonempty digit
      sequence,
    - is optionally followed by '.' and a precision specification: a nonempty
@@ -65,12 +65,18 @@ enum format_arg_type
   FAT_FLOAT
 };
 
+struct numbered_arg
+{
+  unsigned int number;
+  enum format_arg_type type;
+};
+
 struct spec
 {
   unsigned int directives;
-  unsigned int format_args_count;
+  unsigned int numbered_arg_count;
   unsigned int allocated;
-  enum format_arg_type *format_args;
+  struct numbered_arg *numbered;
 };
 
 /* Locale independent test for a decimal digit.
@@ -80,32 +86,71 @@ struct spec
 #define isdigit(c) ((unsigned int) ((c) - '0') < 10)
 
 
+static int
+numbered_arg_compare (const void *p1, const void *p2)
+{
+  unsigned int n1 = ((const struct numbered_arg *) p1)->number;
+  unsigned int n2 = ((const struct numbered_arg *) p2)->number;
+
+  return (n1 > n2 ? 1 : n1 < n2 ? -1 : 0);
+}
+
 static void *
 format_parse (const char *format, bool translated, char *fdi,
               char **invalid_reason)
 {
   const char *const format_start = format;
   struct spec spec;
+  unsigned int unnumbered_arg_count;
   struct spec *result;
 
   spec.directives = 0;
-  spec.format_args_count = 0;
+  spec.numbered_arg_count = 0;
   spec.allocated = 0;
-  spec.format_args = NULL;
+  spec.numbered = NULL;
+  unnumbered_arg_count = 0;
 
   for (; *format != '\0';)
     if (*format++ == '%')
       {
         /* A directive.  */
+        unsigned int number = 0;
         enum format_arg_type type;
 
         FDI_SET (format - 1, FMTDIR_START);
         spec.directives++;
 
+        if (isdigit (*format))
+          {
+            const char *f = format;
+            unsigned int m = 0;
+
+            do
+              {
+                m = 10 * m + (*f - '0');
+                f++;
+              }
+            while (isdigit (*f));
+
+            if (*f == '$')
+              {
+                if (m == 0)
+                  {
+                    *invalid_reason = INVALID_ARGNO_0 (spec.directives);
+                    FDI_SET (f, FMTDIR_ERROR);
+                    goto bad_format;
+                  }
+                number = m;
+                format = ++f;
+              }
+          }
+
+        /* Parse flags.  */
         while (*format == '-' || *format == '+' || *format == ' '
                || *format == '0' || *format == 'I')
           format++;
 
+        /* Parse width.  */
         while (isdigit (*format))
           format++;
 
@@ -152,15 +197,50 @@ format_parse (const char *format, bool translated, char *fdi,
             goto bad_format;
           }
 
-        if (*format != '%')
+        if (type != FAT_NONE)
           {
-            if (spec.allocated == spec.format_args_count)
+            if (number)
+              {
+                /* Numbered argument.  */
+
+                /* Numbered and unnumbered specifications are exclusive.  */
+                if (unnumbered_arg_count > 0)
+                  {
+                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
+                    FDI_SET (format, FMTDIR_ERROR);
+                    goto bad_format;
+                  }
+
+                if (spec.allocated == spec.numbered_arg_count)
+                  {
+                    spec.allocated = 2 * spec.allocated + 1;
+                    spec.numbered = (struct numbered_arg *) xrealloc (spec.numbered, spec.allocated * sizeof (struct numbered_arg));
+                  }
+                spec.numbered[spec.numbered_arg_count].number = number;
+                spec.numbered[spec.numbered_arg_count].type = type;
+                spec.numbered_arg_count++;
+              }
+            else
               {
-                spec.allocated = 2 * spec.allocated + 1;
-                spec.format_args = (enum format_arg_type *) xrealloc (spec.format_args, spec.allocated * sizeof (enum format_arg_type));
+                /* Unnumbered argument.  */
+
+                /* Numbered and unnumbered specifications are exclusive.  */
+                if (spec.numbered_arg_count > 0)
+                  {
+                    *invalid_reason = INVALID_MIXES_NUMBERED_UNNUMBERED ();
+                    FDI_SET (format, FMTDIR_ERROR);
+                    goto bad_format;
+                  }
+
+                if (spec.allocated == unnumbered_arg_count)
+                  {
+                    spec.allocated = 2 * spec.allocated + 1;
+                    spec.numbered = (struct numbered_arg *) xrealloc (spec.numbered, spec.allocated * sizeof (struct numbered_arg));
+                  }
+                spec.numbered[unnumbered_arg_count].number = unnumbered_arg_count + 1;
+                spec.numbered[unnumbered_arg_count].type = type;
+                unnumbered_arg_count++;
               }
-            spec.format_args[spec.format_args_count] = type;
-            spec.format_args_count++;
           }
 
         FDI_SET (format, FMTDIR_END);
@@ -168,13 +248,63 @@ format_parse (const char *format, bool translated, char *fdi,
         format++;
       }
 
+  /* Convert the unnumbered argument array to numbered arguments.  */
+  if (unnumbered_arg_count > 0)
+    spec.numbered_arg_count = unnumbered_arg_count;
+  /* Sort the numbered argument array, and eliminate duplicates.  */
+  else if (spec.numbered_arg_count > 1)
+    {
+      unsigned int i, j;
+      bool err;
+
+      qsort (spec.numbered, spec.numbered_arg_count,
+             sizeof (struct numbered_arg), numbered_arg_compare);
+
+      /* Remove duplicates: Copy from i to j, keeping 0 <= j <= i.  */
+      err = false;
+      for (i = j = 0; i < spec.numbered_arg_count; i++)
+        if (j > 0 && spec.numbered[i].number == spec.numbered[j-1].number)
+          {
+            enum format_arg_type type1 = spec.numbered[i].type;
+            enum format_arg_type type2 = spec.numbered[j-1].type;
+            enum format_arg_type type_both;
+
+            if (type1 == type2)
+              type_both = type1;
+            else
+              {
+                /* Incompatible types.  */
+                type_both = FAT_NONE;
+                if (!err)
+                  *invalid_reason =
+                    INVALID_INCOMPATIBLE_ARG_TYPES (spec.numbered[i].number);
+                err = true;
+              }
+
+            spec.numbered[j-1].type = type_both;
+          }
+        else
+          {
+            if (j < i)
+              {
+                spec.numbered[j].number = spec.numbered[i].number;
+                spec.numbered[j].type = spec.numbered[i].type;
+              }
+            j++;
+          }
+      spec.numbered_arg_count = j;
+      if (err)
+        /* *invalid_reason has already been set above.  */
+        goto bad_format;
+    }
+
   result = XMALLOC (struct spec);
   *result = spec;
   return result;
 
  bad_format:
-  if (spec.format_args != NULL)
-    free (spec.format_args);
+  if (spec.numbered != NULL)
+    free (spec.numbered);
   return NULL;
 }
 
@@ -183,8 +313,8 @@ format_free (void *descr)
 {
   struct spec *spec = (struct spec *) descr;
 
-  if (spec->format_args != NULL)
-    free (spec->format_args);
+  if (spec->numbered != NULL)
+    free (spec->numbered);
   free (spec);
 }
 
@@ -205,30 +335,69 @@ format_check (void *msgid_descr, void *msgstr_descr, bool equality,
   struct spec *spec2 = (struct spec *) msgstr_descr;
   bool err = false;
 
-  if (spec1->format_args_count + spec2->format_args_count > 0)
+  if (spec1->numbered_arg_count + spec2->numbered_arg_count > 0)
     {
-      unsigned int i;
+      unsigned int i, j;
+      unsigned int n1 = spec1->numbered_arg_count;
+      unsigned int n2 = spec2->numbered_arg_count;
 
-      /* Check the argument types are the same.  */
-      if (spec1->format_args_count != spec2->format_args_count)
+      /* Check the argument names are the same.
+         Both arrays are sorted.  We search for the first difference.  */
+      for (i = 0, j = 0; i < n1 || j < n2; )
         {
-          if (error_logger)
-            error_logger (_("number of format specifications in '%s' and '%s' does not match"),
-                          pretty_msgid, pretty_msgstr);
-          err = true;
-        }
-      else
-        for (i = 0; i < spec2->format_args_count; i++)
-          if (!(spec1->format_args[i] == spec2->format_args[i]
-                || (!equality
-                    && (spec1->format_args[i] == FAT_ANY
-                        || spec2->format_args[i] == FAT_ANY))))
+          int cmp = (i >= n1 ? 1 :
+                     j >= n2 ? -1 :
+                     spec1->numbered[i].number > spec2->numbered[j].number ? 1 :
+                     spec1->numbered[i].number < spec2->numbered[j].number ? -1 :
+                     0);
+          if (cmp > 0)
             {
               if (error_logger)
-                error_logger (_("format specifications in '%s' and '%s' for argument %u are not the same"),
-                              pretty_msgid, pretty_msgstr, i + 1);
+                error_logger (_("a format specification for argument %u, as in '%s', doesn't exist in '%s'"),
+                              spec2->numbered[j].number, pretty_msgstr,
+                              pretty_msgid);
               err = true;
+              break;
             }
+          else if (cmp < 0)
+            {
+              if (equality)
+                {
+                  if (error_logger)
+                    error_logger (_("a format specification for argument %u doesn't exist in '%s'"),
+                                  spec1->numbered[i].number, pretty_msgstr);
+                  err = true;
+                  break;
+                }
+              else
+                i++;
+            }
+          else
+            j++, i++;
+        }
+      /* Check the argument types are the same.  */
+      if (!err)
+        for (i = 0, j = 0; j < n2; )
+          {
+            if (spec1->numbered[i].number == spec2->numbered[j].number)
+              {
+                if (!(spec1->numbered[i].type == spec2->numbered[j].type
+                      || (!equality
+                          && (spec1->numbered[i].type == FAT_ANY
+                              || spec2->numbered[i].type == FAT_ANY))))
+                  {
+                    if (error_logger)
+                      error_logger (_("format specifications in '%s' and '%s' for argument %u are not the same"),
+                                    pretty_msgid, pretty_msgstr,
+                                    spec2->numbered[j].number);
+                    err = true;
+                    break;
+                  }
+                j++, i++;
+              }
+            else
+              i++;
+          }
     }
 
   return err;
@@ -265,11 +434,11 @@ format_print (void *descr)
     }
 
       printf ("(");
-      for (i = 0; i < spec->format_args_count; i++)
+      for (i = 0; i < spec->numbered_arg_count; i++)
         {
           if (i > 0)
             printf (" ");
-          switch (spec->format_args[i])
+          switch (spec->numbered[i].type)
             {
             case FAT_ANY:
               printf ("*");
diff --git a/gettext-tools/src/format-kde-kuit.c b/gettext-tools/src/format-kde-kuit.c
index 128d05d..ab9568d 100644
--- a/gettext-tools/src/format-kde-kuit.c
+++ b/gettext-tools/src/format-kde-kuit.c
@@ -1,5 +1,5 @@
 /* KUIT (KDE User Interface Text) format strings.
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2015.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/format-kde.c b/gettext-tools/src/format-kde.c
index 6848781..6adddba 100644
--- a/gettext-tools/src/format-kde.c
+++ b/gettext-tools/src/format-kde.c
@@ -1,5 +1,5 @@
 /* KDE format strings.
-   Copyright (C) 2003-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2003-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
diff --git a/gettext-tools/src/format-librep.c b/gettext-tools/src/format-librep.c
index 9c15aea..7e99de0 100644
--- a/gettext-tools/src/format-librep.c
+++ b/gettext-tools/src/format-librep.c
@@ -1,5 +1,5 @@
 /* librep format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/format-lisp.c b/gettext-tools/src/format-lisp.c
index 2f9949e..f6c7f93 100644
--- a/gettext-tools/src/format-lisp.c
+++ b/gettext-tools/src/format-lisp.c
@@ -1,5 +1,5 @@
 /* Lisp format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/format-lua.c b/gettext-tools/src/format-lua.c
index 6a68b82..1345555 100644
--- a/gettext-tools/src/format-lua.c
+++ b/gettext-tools/src/format-lua.c
@@ -1,5 +1,5 @@
 /* Lua format strings.
-   Copyright (C) 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2012, 2015-2016 Free Software Foundation, Inc.
    Written by Ľubomír Remák <lubomirr@lubomirr.eu>, 2012.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/format-pascal.c b/gettext-tools/src/format-pascal.c
index b443ba7..e56b3e5 100644
--- a/gettext-tools/src/format-pascal.c
+++ b/gettext-tools/src/format-pascal.c
@@ -1,5 +1,5 @@
 /* Object Pascal format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2010, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009-2010, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/format-perl-brace.c b/gettext-tools/src/format-perl-brace.c
index 64a0663..b6cbf04 100644
--- a/gettext-tools/src/format-perl-brace.c
+++ b/gettext-tools/src/format-perl-brace.c
@@ -1,5 +1,5 @@
 /* Perl brace format strings.
-   Copyright (C) 2004, 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/format-perl.c b/gettext-tools/src/format-perl.c
index af741e9..3d01616 100644
--- a/gettext-tools/src/format-perl.c
+++ b/gettext-tools/src/format-perl.c
@@ -1,5 +1,5 @@
 /* Perl format strings.
-   Copyright (C) 2004, 2006-2007, 2009, 2015 Free Software Foundation,
+   Copyright (C) 2004, 2006-2007, 2009, 2015-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/format-php.c b/gettext-tools/src/format-php.c
index ebaaa33..bac5a47 100644
--- a/gettext-tools/src/format-php.c
+++ b/gettext-tools/src/format-php.c
@@ -1,5 +1,5 @@
 /* PHP format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
diff --git a/gettext-tools/src/format-python-brace.c b/gettext-tools/src/format-python-brace.c
index 4323230..c76088c 100644
--- a/gettext-tools/src/format-python-brace.c
+++ b/gettext-tools/src/format-python-brace.c
@@ -1,5 +1,5 @@
 /* Python brace format strings.
-   Copyright (C) 2004, 2006-2007, 2013, 2015 Free Software Foundation,
+   Copyright (C) 2004, 2006-2007, 2013, 2015-2016 Free Software Foundation,
    Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2013.
 
@@ -140,42 +140,49 @@ parse_directive (struct spec *spec,
       return false;
     }
 
-  c = *format;
-  if (c == '.')
+  /* Parse '.' (getattr) or '[..]' (getitem) operators followed by a
+     name.  If must not recurse, but can be specifed in a chain, such
+     as "foo.bar.baz[0]".  */
+  for (;;)
     {
-      format++;
-      if (!parse_named_field (spec, &format, translated, fdi,
-                              invalid_reason))
-        {
-          *invalid_reason =
-            xasprintf (_("In the directive number %u, '%c' cannot start a getattr argument."), spec->directives, *format);
-          FDI_SET (format, FMTDIR_ERROR);
-          return false;
-        }
       c = *format;
-    }
-  else if (c == '[')
-    {
-      format++;
-      if (!parse_named_field (spec, &format, translated, fdi,
-                              invalid_reason)
-          && !parse_numeric_field (spec, &format, translated, fdi,
-                                   invalid_reason))
+
+      if (c == '.')
         {
-          *invalid_reason =
-            xasprintf (_("In the directive number %u, '%c' cannot start a getitem argument."), spec->directives, *format);
-          FDI_SET (format, FMTDIR_ERROR);
-          return false;
+          format++;
+          if (!parse_named_field (spec, &format, translated, fdi,
+                                  invalid_reason))
+            {
+              *invalid_reason =
+                xasprintf (_("In the directive number %u, '%c' cannot start a getattr argument."), spec->directives, *format);
+              FDI_SET (format, FMTDIR_ERROR);
+              return false;
+            }
         }
-
-      c = *format++;
-      if (c != ']')
+      else if (c == '[')
         {
-          *invalid_reason = INVALID_UNTERMINATED_DIRECTIVE ();
-          FDI_SET (format, FMTDIR_ERROR);
-          return false;
+          format++;
+          if (!parse_named_field (spec, &format, translated, fdi,
+                                  invalid_reason)
+              && !parse_numeric_field (spec, &format, translated, fdi,
+                                       invalid_reason))
+            {
+              *invalid_reason =
+                xasprintf (_("In the directive number %u, '%c' cannot start a getitem argument."), spec->directives, *format);
+              FDI_SET (format, FMTDIR_ERROR);
+              return false;
+            }
+
+          c = *format++;
+          if (c != ']')
+            {
+              *invalid_reason = INVALID_UNTERMINATED_DIRECTIVE ();
+              FDI_SET (format, FMTDIR_ERROR);
+              return false;
+            }
         }
-      c = *format;
+      else
+        break;
     }
 
   if (c == ':')
diff --git a/gettext-tools/src/format-python.c b/gettext-tools/src/format-python.c
index 8af3c12..408553b 100644
--- a/gettext-tools/src/format-python.c
+++ b/gettext-tools/src/format-python.c
@@ -1,6 +1,5 @@
 /* Python format strings.
-   Copyright (C) 2001-2004, 2006-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2004, 2006-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/format-qt-plural.c b/gettext-tools/src/format-qt-plural.c
index fafe6ab..fd26c5c 100644
--- a/gettext-tools/src/format-qt-plural.c
+++ b/gettext-tools/src/format-qt-plural.c
@@ -1,5 +1,5 @@
 /* Qt plural format strings.
-   Copyright (C) 2003-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2003-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
diff --git a/gettext-tools/src/format-qt.c b/gettext-tools/src/format-qt.c
index abdc4da..1db68c5 100644
--- a/gettext-tools/src/format-qt.c
+++ b/gettext-tools/src/format-qt.c
@@ -1,5 +1,5 @@
 /* Qt format strings.
-   Copyright (C) 2003-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2003-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/format-scheme.c b/gettext-tools/src/format-scheme.c
index adc1cc6..042858d 100644
--- a/gettext-tools/src/format-scheme.c
+++ b/gettext-tools/src/format-scheme.c
@@ -1,5 +1,5 @@
 /* Scheme format strings.
-   Copyright (C) 2001-2007, 2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/format-sh.c b/gettext-tools/src/format-sh.c
index eeeec04..fff679f 100644
--- a/gettext-tools/src/format-sh.c
+++ b/gettext-tools/src/format-sh.c
@@ -1,5 +1,5 @@
 /* Shell format strings.
-   Copyright (C) 2003-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2003-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/format-tcl.c b/gettext-tools/src/format-tcl.c
index 1254b2d..eb61c44 100644
--- a/gettext-tools/src/format-tcl.c
+++ b/gettext-tools/src/format-tcl.c
@@ -1,5 +1,5 @@
 /* Tcl format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
diff --git a/gettext-tools/src/format-ycp.c b/gettext-tools/src/format-ycp.c
index 398b644..880dcdf 100644
--- a/gettext-tools/src/format-ycp.c
+++ b/gettext-tools/src/format-ycp.c
@@ -1,5 +1,5 @@
 /* YCP and Smalltalk format strings.
-   Copyright (C) 2001-2004, 2006-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2004, 2006-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/format.c b/gettext-tools/src/format.c
index 69b1f47..82e53d0 100644
--- a/gettext-tools/src/format.c
+++ b/gettext-tools/src/format.c
@@ -1,5 +1,5 @@
 /* Format strings.
-   Copyright (C) 2001-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/format.h b/gettext-tools/src/format.h
index b311e48..78b729e 100644
--- a/gettext-tools/src/format.h
+++ b/gettext-tools/src/format.h
@@ -1,5 +1,5 @@
 /* Format strings.
-   Copyright (C) 2001-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/gnu/gettext/DumpResource.java b/gettext-tools/src/gnu/gettext/DumpResource.java
index 40a1d92..e5eb4a3 100644
--- a/gettext-tools/src/gnu/gettext/DumpResource.java
+++ b/gettext-tools/src/gnu/gettext/DumpResource.java
@@ -1,5 +1,5 @@
 /* GNU gettext for Java
- * Copyright (C) 2001-2003, 2007, 2015 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2003, 2007, 2015-2016 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
diff --git a/gettext-tools/src/gnu/gettext/GetURL.java b/gettext-tools/src/gnu/gettext/GetURL.java
index 9faac6d..a599e5c 100644
--- a/gettext-tools/src/gnu/gettext/GetURL.java
+++ b/gettext-tools/src/gnu/gettext/GetURL.java
@@ -1,5 +1,5 @@
 /* Fetch an URL's contents.
- * Copyright (C) 2001, 2008, 2015 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2008, 2015-2016 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
diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
index 684aa4e..399edf0 100644
--- a/gettext-tools/src/hostname.c
+++ b/gettext-tools/src/hostname.c
@@ -1,5 +1,5 @@
 /* Display hostname in various forms.
-   Copyright (C) 2001-2003, 2006-2007, 2012, 2015 Free Software
+   Copyright (C) 2001-2003, 2006-2007, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/its.c b/gettext-tools/src/its.c
index ce4880a..136299a 100644
--- a/gettext-tools/src/its.c
+++ b/gettext-tools/src/its.c
@@ -1,5 +1,5 @@
 /* Internationalization Tag Set (ITS) handling
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
diff --git a/gettext-tools/src/its.h b/gettext-tools/src/its.h
index 8d597f5..d1eab31 100644
--- a/gettext-tools/src/its.h
+++ b/gettext-tools/src/its.h
@@ -1,5 +1,5 @@
 /* Internationalization Tag Set (ITS) handling
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
diff --git a/gettext-tools/src/lang-table.c b/gettext-tools/src/lang-table.c
index ac69021..ecc7288 100644
--- a/gettext-tools/src/lang-table.c
+++ b/gettext-tools/src/lang-table.c
@@ -1,5 +1,5 @@
 /* Table of languages.
-   Copyright (C) 2001-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/lang-table.h b/gettext-tools/src/lang-table.h
index 59f5802..464c4e1 100644
--- a/gettext-tools/src/lang-table.h
+++ b/gettext-tools/src/lang-table.h
@@ -1,5 +1,5 @@
 /* Table of languages.
-   Copyright (C) 2001-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/locating-rule.c b/gettext-tools/src/locating-rule.c
index 2a1de19..382d162 100644
--- a/gettext-tools/src/locating-rule.c
+++ b/gettext-tools/src/locating-rule.c
@@ -1,5 +1,5 @@
 /* XML resource locating rules
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
diff --git a/gettext-tools/src/locating-rule.h b/gettext-tools/src/locating-rule.h
index f1214bc..934c3e9 100644
--- a/gettext-tools/src/locating-rule.h
+++ b/gettext-tools/src/locating-rule.h
@@ -1,5 +1,5 @@
 /* XML resource locating rules
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2015.
 
diff --git a/gettext-tools/src/message.c b/gettext-tools/src/message.c
index bc1604c..a5ecdcc 100644
--- a/gettext-tools/src/message.c
+++ b/gettext-tools/src/message.c
@@ -1,6 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1998, 2000-2009, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -111,7 +110,8 @@ const char *const syntax_check_name[NSYNTAXCHECKS] =
 {
   /* sc_ellipsis_unicode */     "ellipsis-unicode",
   /* sc_space_ellipsis */       "space-ellipsis",
-  /* sc_quote_unicode */        "quote-unicode"
+  /* sc_quote_unicode */        "quote-unicode",
+  /* sc_bullet_unicode */       "bullet-unicode"
 };
 
 
diff --git a/gettext-tools/src/message.h b/gettext-tools/src/message.h
index ec86ff1..7b333f2 100644
--- a/gettext-tools/src/message.h
+++ b/gettext-tools/src/message.h
@@ -1,6 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1998, 2000-2009, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -121,9 +120,10 @@ enum syntax_check_type
 {
   sc_ellipsis_unicode,
   sc_space_ellipsis,
-  sc_quote_unicode
+  sc_quote_unicode,
+  sc_bullet_unicode
 };
-#define NSYNTAXCHECKS 3
+#define NSYNTAXCHECKS 4
 extern DLL_VARIABLE const char *const syntax_check_name[NSYNTAXCHECKS];
 
 /* Is current msgid subject to a syntax check?  */
diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c
index 1f945b6..e5be7d6 100644
--- a/gettext-tools/src/msgattrib.c
+++ b/gettext-tools/src/msgattrib.c
@@ -1,5 +1,5 @@
 /* Manipulates attributes of messages in translation catalogs.
-   Copyright (C) 2001-2007, 2009-2010, 2012, 2015 Free Software
+   Copyright (C) 2001-2007, 2009-2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -358,7 +358,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "2001-2010");
+              "2001-2016");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index c0b6fd4..735cf2b 100644
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -1,6 +1,5 @@
 /* Concatenates several translation catalogs.
-   Copyright (C) 2001-2007, 2009-2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2007, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -297,7 +296,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "2001-2010");
+              "2001-2016");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c
index 4fadbb6..870b3c8 100644
--- a/gettext-tools/src/msgcmp.c
+++ b/gettext-tools/src/msgcmp.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2010, 2012, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -175,7 +175,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "1995-1998, 2000-2010");
+              "1995-1998, 2000-2016");
       printf (_("Written by %s.\n"), proper_name ("Peter Miller"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index c731297..3399a35 100644
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -1,6 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1997-1998, 2000-2007, 2009-2015 Free Software
-   Foundation, Inc.
+   Copyright (C) 1997-1998, 2000-2007, 2009-2016 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -288,7 +287,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "1995-1998, 2000-2010");
+              "1995-1998, 2000-2016");
       printf (_("Written by %s.\n"), proper_name ("Peter Miller"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index e407ac6..4575b17 100644
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -1,5 +1,5 @@
 /* Converts a translation catalog to a different character encoding.
-   Copyright (C) 2001-2007, 2009-2010, 2012, 2015 Free Software
+   Copyright (C) 2001-2007, 2009-2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -247,7 +247,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "2001-2010");
+              "2001-2016");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c
index e6eda09..1d1b3c7 100644
--- a/gettext-tools/src/msgen.c
+++ b/gettext-tools/src/msgen.c
@@ -1,5 +1,5 @@
 /* Creates an English translation catalog.
-   Copyright (C) 2001-2007, 2009-2010, 2012, 2015 Free Software
+   Copyright (C) 2001-2007, 2009-2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -244,7 +244,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "2001-2010");
+              "2001-2016");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index e7594fc..1ab6c88 100644
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -1,5 +1,5 @@
 /* Pass translations to a subprocess.
-   Copyright (C) 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -189,7 +189,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "2001-2010");
+              "2001-2016");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c
index aa358e1..7290a43 100644
--- a/gettext-tools/src/msgfilter.c
+++ b/gettext-tools/src/msgfilter.c
@@ -1,5 +1,5 @@
 /* Edit translations using a subprocess.
-   Copyright (C) 2001-2010, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2010, 2012, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -291,7 +291,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "2001-2010");
+              "2001-2016");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 0517c99..940121d 100644
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -1,6 +1,6 @@
 /* Converts Uniforum style .po files to binary .mo files
-   Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012, 2015-2016 Free Software
+   Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -65,6 +65,7 @@
 #include "concat-filename.h"
 #include "its.h"
 #include "locating-rule.h"
+#include "search-path.h"
 #include "gettext.h"
 
 #define _(str) gettext (str)
@@ -251,6 +252,7 @@ main (int argc, char *argv[])
 
   /* Set default value for global variables.  */
   alignment = DEFAULT_OUTPUT_ALIGNMENT;
+  byteswap = 0 ^ ENDIANNESS;
 
   /* Set program name for messages.  */
   set_program_name (argv[0]);
@@ -446,7 +448,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "1995-1998, 2000-2010");
+              "1995-1998, 2000-2016");
       printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
       exit (EXIT_SUCCESS);
     }
@@ -663,31 +665,15 @@ There is NO WARRANTY, to the extent permitted by law.\n\
 
   if (xml_mode)
     {
-      const char *gettextdatadir;
-      char *versioned_gettextdatadir;
-      char *its_dirs[2] = { NULL, NULL };
+      char **its_dirs;
+      char **dirs;
       locating_rule_list_ty *its_locating_rules;
       const char *its_basename;
-      size_t i;
-
-      /* Make it possible to override the locator file location.  This
-         is necessary for running the testsuite before "make
-         install".  */
-      gettextdatadir = getenv ("GETTEXTDATADIR");
-      if (gettextdatadir == NULL || gettextdatadir[0] == '\0')
-        gettextdatadir = relocate (GETTEXTDATADIR);
-
-      its_dirs[0] = xconcatenated_filename (gettextdatadir, "its", NULL);
-
-      versioned_gettextdatadir =
-        xasprintf ("%s%s", relocate (GETTEXTDATADIR), PACKAGE_SUFFIX);
-      its_dirs[1] = xconcatenated_filename (versioned_gettextdatadir, "its",
-                                            NULL);
-      free (versioned_gettextdatadir);
 
+      its_dirs = get_search_path ("its");
       its_locating_rules = locating_rule_list_alloc ();
-      for (i = 0; i < SIZEOF (its_dirs); i++)
-        locating_rule_list_add_from_directory (its_locating_rules, its_dirs[i]);
+      for (dirs = its_dirs; *dirs != NULL; dirs++)
+        locating_rule_list_add_from_directory (its_locating_rules, *dirs);
 
       its_basename = locating_rule_list_locate (its_locating_rules,
                                                 xml_template_name,
@@ -698,7 +684,7 @@ There is NO WARRANTY, to the extent permitted by law.\n\
           size_t j;
 
           xml_its_rules = its_rule_list_alloc ();
-          for (j = 0; j < SIZEOF (its_dirs); j++)
+          for (j = 0; its_dirs[j] != NULL; j++)
             {
               char *its_filename =
                 xconcatenated_filename (its_dirs[j], its_basename, NULL);
@@ -711,7 +697,7 @@ There is NO WARRANTY, to the extent permitted by law.\n\
               if (ok)
                 break;
             }
-          if (j == SIZEOF (its_dirs))
+          if (its_dirs[j] == NULL)
             {
               its_rule_list_free (xml_its_rules);
               xml_its_rules = NULL;
@@ -719,6 +705,10 @@ There is NO WARRANTY, to the extent permitted by law.\n\
         }
       locating_rule_list_free (its_locating_rules);
 
+      for (dirs = its_dirs; *dirs != NULL; dirs++)
+        free (*dirs);
+      free (its_dirs);
+
       if (xml_its_rules == NULL)
         error (EXIT_FAILURE, 0, _("cannot locate ITS rules for %s"),
                xml_template_name);
diff --git a/gettext-tools/src/msgfmt.cs b/gettext-tools/src/msgfmt.cs
index 1a97f64..bbd4d9e 100644
--- a/gettext-tools/src/msgfmt.cs
+++ b/gettext-tools/src/msgfmt.cs
@@ -1,5 +1,5 @@
 /* GNU gettext for C#
- * Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
  * Written by Bruno Haible <bruno@clisp.org>, 2003.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgfmt.h b/gettext-tools/src/msgfmt.h
index 3651a30..dd3109d 100644
--- a/gettext-tools/src/msgfmt.h
+++ b/gettext-tools/src/msgfmt.h
@@ -1,5 +1,5 @@
 /* msgfmt specifics
-   Copyright (C) 1995-1998, 2000-2001, 2009, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2001, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c
index b0cb87a..2b68055 100644
--- a/gettext-tools/src/msggrep.c
+++ b/gettext-tools/src/msggrep.c
@@ -1,5 +1,5 @@
 /* Extract some translations of a translation catalog.
-   Copyright (C) 2001-2007, 2009-2010, 2012, 2015 Free Software
+   Copyright (C) 2001-2007, 2009-2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -422,7 +422,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "2001-2010");
+              "2001-2016");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index f85b83c..0cdb489 100644
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -1,5 +1,5 @@
 /* Initializes a new PO file.
-   Copyright (C) 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -271,7 +271,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "2001-2010");
+              "2001-2016");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgl-ascii.c b/gettext-tools/src/msgl-ascii.c
index c92e4df..83f31e5 100644
--- a/gettext-tools/src/msgl-ascii.c
+++ b/gettext-tools/src/msgl-ascii.c
@@ -1,6 +1,5 @@
 /* Message list test for ASCII character set.
-   Copyright (C) 2001-2002, 2005-2006, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2002, 2005-2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-ascii.h b/gettext-tools/src/msgl-ascii.h
index b6e09f9..2f97a4f 100644
--- a/gettext-tools/src/msgl-ascii.h
+++ b/gettext-tools/src/msgl-ascii.h
@@ -1,5 +1,5 @@
 /* Message list test for ASCII character set.
-   Copyright (C) 2001-2003, 2005, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-cat.c b/gettext-tools/src/msgl-cat.c
index dfedcb6..02bc849 100644
--- a/gettext-tools/src/msgl-cat.c
+++ b/gettext-tools/src/msgl-cat.c
@@ -1,5 +1,5 @@
 /* Message list concatenation and duplicate handling.
-   Copyright (C) 2001-2003, 2005-2008, 2012, 2015 Free Software
+   Copyright (C) 2001-2003, 2005-2008, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/msgl-cat.h b/gettext-tools/src/msgl-cat.h
index 12a9f80..44b1068 100644
--- a/gettext-tools/src/msgl-cat.h
+++ b/gettext-tools/src/msgl-cat.h
@@ -1,5 +1,5 @@
 /* Message list concatenation and duplicate handling.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-charset.c b/gettext-tools/src/msgl-charset.c
index 278d270..0863427 100644
--- a/gettext-tools/src/msgl-charset.c
+++ b/gettext-tools/src/msgl-charset.c
@@ -1,5 +1,5 @@
 /* Message list charset and locale charset handling.
-   Copyright (C) 2001-2003, 2005-2007, 2009, 2015 Free Software
+   Copyright (C) 2001-2003, 2005-2007, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/msgl-charset.h b/gettext-tools/src/msgl-charset.h
index c673d1d..0d00c4e 100644
--- a/gettext-tools/src/msgl-charset.h
+++ b/gettext-tools/src/msgl-charset.h
@@ -1,5 +1,5 @@
 /* Message list charset and locale charset handling.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-check.c b/gettext-tools/src/msgl-check.c
index 7934120..5bbca85 100644
--- a/gettext-tools/src/msgl-check.c
+++ b/gettext-tools/src/msgl-check.c
@@ -1,6 +1,5 @@
 /* Checking of messages in PO files.
-   Copyright (C) 1995-1998, 2000-2008, 2010-2015 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2008, 2010-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -1069,13 +1068,116 @@ syntax_check_quote_unicode (const message_ty *mp, const char *msgid)
   return arg.seen_errors;
 }
 
+struct bullet_ty
+{
+  int c;
+  size_t depth;
+};
+
+struct bullet_stack_ty
+{
+  struct bullet_ty *items;
+  size_t nitems;
+  size_t nitems_max;
+};
+
+static struct bullet_stack_ty bullet_stack;
+
+static int
+syntax_check_bullet_unicode (const message_ty *mp, const char *msgid)
+{
+  const char *str = msgid;
+  const char *str_limit = str + strlen (msgid);
+  struct bullet_ty *last_bullet = NULL;
+  bool seen_error = false;
+
+  bullet_stack.nitems = 0;
+
+  while (str < str_limit)
+    {
+      const char *p = str, *end;
+
+      while (p < str_limit && c_isspace (*p))
+        p++;
+
+      if ((*p == '*' || *p == '-') && *(p + 1) == ' ')
+        {
+          size_t depth = p - str;
+          if (last_bullet == NULL || depth > last_bullet->depth)
+            {
+              struct bullet_ty bullet;
+
+              bullet.c = *p;
+              bullet.depth = depth;
+
+              if (bullet_stack.nitems >= bullet_stack.nitems_max)
+                {
+                  bullet_stack.nitems_max = 2 * bullet_stack.nitems_max + 4;
+                  bullet_stack.items = xrealloc (bullet_stack.items,
+                                                 bullet_stack.nitems_max
+                                                 * sizeof (struct bullet_ty));
+                }
+
+              last_bullet = &bullet_stack.items[bullet_stack.nitems++];
+              memcpy (last_bullet, &bullet, sizeof (struct bullet_ty));
+            }
+          else
+            {
+              if (depth < last_bullet->depth)
+                {
+                  if (bullet_stack.nitems > 1)
+                    {
+                      bullet_stack.nitems--;
+                      last_bullet =
+                        &bullet_stack.items[bullet_stack.nitems - 1];
+                    }
+                  else
+                    last_bullet = NULL;
+                }
+
+              if (last_bullet && depth == last_bullet->depth)
+                {
+                  if (last_bullet->c != *p)
+                    last_bullet->c = *p;
+                  else
+                    {
+                      seen_error = true;
+                      break;
+                    }
+                }
+            }
+        }
+      else
+        {
+          bullet_stack.nitems = 0;
+          last_bullet = NULL;
+        }
+
+      end = strchrnul (str, '\n');
+      str = end + 1;
+    }
+
+  if (seen_error)
+    {
+      char *msg;
+      msg = xasprintf (_("ASCII bullet ('%c') instead of Unicode"),
+                       last_bullet->c);
+      po_xerror (PO_SEVERITY_ERROR, mp, NULL, 0, 0, false, msg);
+      free (msg);
+      return 1;
+    }
+
+  return 0;
+}
+
 
 typedef int (* syntax_check_function) (const message_ty *mp, const char *msgid);
 static const syntax_check_function sc_funcs[NSYNTAXCHECKS] =
 {
   syntax_check_ellipsis_unicode,
   syntax_check_space_ellipsis,
-  syntax_check_quote_unicode
+  syntax_check_quote_unicode,
+  syntax_check_bullet_unicode
 };
 
 /* Perform all syntax checks on a non-obsolete message.
diff --git a/gettext-tools/src/msgl-check.h b/gettext-tools/src/msgl-check.h
index cfb86fb..348f69a 100644
--- a/gettext-tools/src/msgl-check.h
+++ b/gettext-tools/src/msgl-check.h
@@ -1,5 +1,5 @@
 /* Checking of messages in PO files.
-   Copyright (C) 2005, 2008, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-english.c b/gettext-tools/src/msgl-english.c
index 6304504..54c84ab 100644
--- a/gettext-tools/src/msgl-english.c
+++ b/gettext-tools/src/msgl-english.c
@@ -1,5 +1,5 @@
 /* Message translation initialization for English.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-english.h b/gettext-tools/src/msgl-english.h
index ce0af6b..e2e9878 100644
--- a/gettext-tools/src/msgl-english.h
+++ b/gettext-tools/src/msgl-english.h
@@ -1,5 +1,5 @@
 /* Message translation initialization for English.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-equal.c b/gettext-tools/src/msgl-equal.c
index fd28d01..2efe925 100644
--- a/gettext-tools/src/msgl-equal.c
+++ b/gettext-tools/src/msgl-equal.c
@@ -1,5 +1,5 @@
 /* Message list test for equality.
-   Copyright (C) 2001-2002, 2005-2006, 2008, 2015 Free Software
+   Copyright (C) 2001-2002, 2005-2006, 2008, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/msgl-equal.h b/gettext-tools/src/msgl-equal.h
index 07f052e..2c56417 100644
--- a/gettext-tools/src/msgl-equal.h
+++ b/gettext-tools/src/msgl-equal.h
@@ -1,5 +1,5 @@
 /* Message list test for equality.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-fsearch.c b/gettext-tools/src/msgl-fsearch.c
index 5e087e2..f7bb27c 100644
--- a/gettext-tools/src/msgl-fsearch.c
+++ b/gettext-tools/src/msgl-fsearch.c
@@ -1,5 +1,5 @@
 /* Fast fuzzy searching among messages.
-   Copyright (C) 2006, 2008, 2011, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008, 2011, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-fsearch.h b/gettext-tools/src/msgl-fsearch.h
index 825e2a8..e2ee6f8 100644
--- a/gettext-tools/src/msgl-fsearch.h
+++ b/gettext-tools/src/msgl-fsearch.h
@@ -1,5 +1,5 @@
 /* Fast fuzzy searching among messages.
-   Copyright (C) 2006, 2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-header.c b/gettext-tools/src/msgl-header.c
index d5f6a88..987c1c4 100644
--- a/gettext-tools/src/msgl-header.c
+++ b/gettext-tools/src/msgl-header.c
@@ -1,5 +1,5 @@
 /* Message list header manipulation.
-   Copyright (C) 2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-header.h b/gettext-tools/src/msgl-header.h
index 6dc1779..9685157 100644
--- a/gettext-tools/src/msgl-header.h
+++ b/gettext-tools/src/msgl-header.h
@@ -1,5 +1,5 @@
 /* Message list header manipulation.
-   Copyright (C) 2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-iconv.c b/gettext-tools/src/msgl-iconv.c
index 06a961f..4a725fc 100644
--- a/gettext-tools/src/msgl-iconv.c
+++ b/gettext-tools/src/msgl-iconv.c
@@ -1,6 +1,5 @@
 /* Message list charset and locale charset handling.
-   Copyright (C) 2001-2003, 2005-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgl-iconv.h b/gettext-tools/src/msgl-iconv.h
index ab61a5b..2bd3510 100644
--- a/gettext-tools/src/msgl-iconv.h
+++ b/gettext-tools/src/msgl-iconv.h
@@ -1,5 +1,5 @@
 /* Message list character set conversion.
-   Copyright (C) 2001-2003, 2005-2006, 2009, 2015 Free Software
+   Copyright (C) 2001-2003, 2005-2006, 2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 50faf2d..470371c 100644
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2010, 2012, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -359,7 +359,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "1995-1998, 2000-2010");
+              "1995-1998, 2000-2016");
       printf (_("Written by %s.\n"), proper_name ("Peter Miller"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c
index c5163be..838fdb3 100644
--- a/gettext-tools/src/msgunfmt.c
+++ b/gettext-tools/src/msgunfmt.c
@@ -1,6 +1,6 @@
 /* msgunfmt - converts binary .mo files to Uniforum style .po files
-   Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2007, 2009-2010, 2012, 2015-2016 Free Software
+   Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -265,7 +265,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "1995-1998, 2000-2010");
+              "1995-1998, 2000-2016");
       printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/msgunfmt.cs b/gettext-tools/src/msgunfmt.cs
index e0e8874..3eca2f5 100644
--- a/gettext-tools/src/msgunfmt.cs
+++ b/gettext-tools/src/msgunfmt.cs
@@ -1,5 +1,5 @@
 /* GNU gettext for C#
- * Copyright (C) 2003-2004, 2007, 2015 Free Software Foundation, Inc.
+ * Copyright (C) 2003-2004, 2007, 2015-2016 Free Software Foundation, Inc.
  * Written by Bruno Haible <bruno@clisp.org>, 2003.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgunfmt.h b/gettext-tools/src/msgunfmt.h
index fc0a505..c7940b3 100644
--- a/gettext-tools/src/msgunfmt.h
+++ b/gettext-tools/src/msgunfmt.h
@@ -1,6 +1,5 @@
 /* msgunfmt specifics
-   Copyright (C) 1995-1998, 2000-2001, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1998, 2000-2001, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/msgunfmt.tcl b/gettext-tools/src/msgunfmt.tcl
index 2eadbc5..7c8988a 100644
--- a/gettext-tools/src/msgunfmt.tcl
+++ b/gettext-tools/src/msgunfmt.tcl
@@ -1,5 +1,5 @@
 # Reading tcl/msgcat .msg files.
-# Copyright (C) 2002, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2015-2016 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
diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c
index 0a81d1e..6b17e3d 100644
--- a/gettext-tools/src/msguniq.c
+++ b/gettext-tools/src/msguniq.c
@@ -1,5 +1,5 @@
 /* Remove, select or merge duplicate translations.
-   Copyright (C) 2001-2007, 2009-2010, 2012, 2015 Free Software
+   Copyright (C) 2001-2007, 2009-2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
@@ -267,7 +267,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "2001-2010");
+              "2001-2016");
       printf (_("Written by %s.\n"), proper_name ("Bruno Haible"));
       exit (EXIT_SUCCESS);
     }
diff --git a/gettext-tools/src/open-catalog.c b/gettext-tools/src/open-catalog.c
index ed87010..0918712 100644
--- a/gettext-tools/src/open-catalog.c
+++ b/gettext-tools/src/open-catalog.c
@@ -1,5 +1,5 @@
 /* open-po - search for .po file along search path list and open for reading
-   Copyright (C) 1995-1996, 2000-2003, 2005-2009, 2015 Free Software
+   Copyright (C) 1995-1996, 2000-2003, 2005-2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
diff --git a/gettext-tools/src/open-catalog.h b/gettext-tools/src/open-catalog.h
index 282c200..5d593fe 100644
--- a/gettext-tools/src/open-catalog.h
+++ b/gettext-tools/src/open-catalog.h
@@ -1,5 +1,5 @@
 /* Opening PO files.
-   Copyright (C) 1995-1997, 2000-2003, 2006, 2015 Free Software
+   Copyright (C) 1995-1997, 2000-2003, 2006, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/plural-count.c b/gettext-tools/src/plural-count.c
index 802ba5e..6930cb7 100644
--- a/gettext-tools/src/plural-count.c
+++ b/gettext-tools/src/plural-count.c
@@ -1,5 +1,5 @@
 /* Plural form count.
-   Copyright (C) 2003, 2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/plural-count.h b/gettext-tools/src/plural-count.h
index 9b86a17..5eac3df 100644
--- a/gettext-tools/src/plural-count.h
+++ b/gettext-tools/src/plural-count.h
@@ -1,5 +1,5 @@
 /* Plural form count.
-   Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/plural-distrib.h b/gettext-tools/src/plural-distrib.h
index d7d2493..09ad273 100644
--- a/gettext-tools/src/plural-distrib.h
+++ b/gettext-tools/src/plural-distrib.h
@@ -1,5 +1,5 @@
 /* Value distribution of plural form expressions.
-   Copyright (C) 2001-2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2008, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001-2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/plural-eval.c b/gettext-tools/src/plural-eval.c
index b2ab856..6d22a71 100644
--- a/gettext-tools/src/plural-eval.c
+++ b/gettext-tools/src/plural-eval.c
@@ -1,5 +1,5 @@
 /* Expression evaluation for plural form selection.
-   Copyright (C) 2000-2003, 2005, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2005, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/plural-eval.h b/gettext-tools/src/plural-eval.h
index e480a9b..5e95670 100644
--- a/gettext-tools/src/plural-eval.h
+++ b/gettext-tools/src/plural-eval.h
@@ -1,5 +1,5 @@
 /* Expression evaluation for plural form selection.
-   Copyright (C) 2005-2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/plural-exp.c b/gettext-tools/src/plural-exp.c
index eb57ce1..d5b9deb 100644
--- a/gettext-tools/src/plural-exp.c
+++ b/gettext-tools/src/plural-exp.c
@@ -1,5 +1,5 @@
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000-2001, 2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/plural-table.c b/gettext-tools/src/plural-table.c
index 25c0bd6..4c0fa21 100644
--- a/gettext-tools/src/plural-table.c
+++ b/gettext-tools/src/plural-table.c
@@ -1,6 +1,5 @@
 /* Table of known plural form expressions.
-   Copyright (C) 2001-2006, 2009-2010, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2006, 2009-2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/plural-table.h b/gettext-tools/src/plural-table.h
index 7c82480..ce8c52d 100644
--- a/gettext-tools/src/plural-table.h
+++ b/gettext-tools/src/plural-table.h
@@ -1,5 +1,5 @@
 /* Table of known plural form expressions.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/po-charset.c b/gettext-tools/src/po-charset.c
index 2f8bae4..31dffab 100644
--- a/gettext-tools/src/po-charset.c
+++ b/gettext-tools/src/po-charset.c
@@ -1,5 +1,5 @@
 /* Charset handling while reading PO files.
-   Copyright (C) 2001-2007, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/po-charset.h b/gettext-tools/src/po-charset.h
index 60484e0..c7272a1 100644
--- a/gettext-tools/src/po-charset.h
+++ b/gettext-tools/src/po-charset.h
@@ -1,5 +1,5 @@
 /* Charset handling while reading PO files.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/po-error.c b/gettext-tools/src/po-error.c
index 565b9ed..837e143 100644
--- a/gettext-tools/src/po-error.c
+++ b/gettext-tools/src/po-error.c
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2004, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2004.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/po-error.h b/gettext-tools/src/po-error.h
index b4eb500..cac4309 100644
--- a/gettext-tools/src/po-error.h
+++ b/gettext-tools/src/po-error.h
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2004, 2006, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2012, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2004.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y
index 0a34068..becf5e6 100644
--- a/gettext-tools/src/po-gram-gen.y
+++ b/gettext-tools/src/po-gram-gen.y
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1996, 1998, 2000-2001, 2003, 2005-2006, 2012, 2015
+   Copyright (C) 1995-1996, 1998, 2000-2001, 2003, 2005-2006, 2012, 2015-2016
    Free Software Foundation, Inc.
 
    This file was written by Peter Miller <pmiller@agso.gov.au>
diff --git a/gettext-tools/src/po-gram.h b/gettext-tools/src/po-gram.h
index 4c8787e..aa22547 100644
--- a/gettext-tools/src/po-gram.h
+++ b/gettext-tools/src/po-gram.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995, 2002-2003, 2006, 2015 Free Software Foundation,
+   Copyright (C) 1995, 2002-2003, 2006, 2015-2016 Free Software Foundation,
    Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c
index a48f59a..00d384b 100644
--- a/gettext-tools/src/po-lex.c
+++ b/gettext-tools/src/po-lex.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-2009, 2011, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1995-2009, 2011, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>.
    Multibyte character handling by Bruno Haible <haible@clisp.cons.org>.
diff --git a/gettext-tools/src/po-lex.h b/gettext-tools/src/po-lex.h
index 257e61a..a11bcd6 100644
--- a/gettext-tools/src/po-lex.h
+++ b/gettext-tools/src/po-lex.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2006, 2012, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2006, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/po-time.c b/gettext-tools/src/po-time.c
index 5147389..5d89626 100644
--- a/gettext-tools/src/po-time.c
+++ b/gettext-tools/src/po-time.c
@@ -1,5 +1,5 @@
 /* PO/POT file timestamps.
-   Copyright (C) 1995-1998, 2000-2003, 2006, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2003, 2006, 2015-2016 Free Software
    Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
diff --git a/gettext-tools/src/po-time.h b/gettext-tools/src/po-time.h
index 4c63006..4309512 100644
--- a/gettext-tools/src/po-time.h
+++ b/gettext-tools/src/po-time.h
@@ -1,5 +1,5 @@
 /* PO/POT file timestamps.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/po-xerror.c b/gettext-tools/src/po-xerror.c
index f58d2bd..30e50fa 100644
--- a/gettext-tools/src/po-xerror.c
+++ b/gettext-tools/src/po-xerror.c
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2005-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/po-xerror.h b/gettext-tools/src/po-xerror.h
index 0493de9..0fd7fc7 100644
--- a/gettext-tools/src/po-xerror.h
+++ b/gettext-tools/src/po-xerror.h
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2005, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/pos.h b/gettext-tools/src/pos.h
index 9c57290..62da852 100644
--- a/gettext-tools/src/pos.h
+++ b/gettext-tools/src/pos.h
@@ -1,6 +1,5 @@
 /* Source file positions.
-   Copyright (C) 1995-1998, 2000-2001, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1998, 2000-2001, 2015-2016 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
diff --git a/gettext-tools/src/project-id b/gettext-tools/src/project-id
index 103f91f..6d14500 100755
--- a/gettext-tools/src/project-id
+++ b/gettext-tools/src/project-id
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Prints a package's identification PACKAGE VERSION or PACKAGE.
 #
-# Copyright (C) 2001-2003, 2005, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2015-2016 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
diff --git a/gettext-tools/src/quote.h b/gettext-tools/src/quote.h
index df8cde2..8320201 100644
--- a/gettext-tools/src/quote.h
+++ b/gettext-tools/src/quote.h
@@ -1,5 +1,5 @@
 /* Handle quoted segments of a string.
-   Copyright (C) 2014-2015 Free Software Foundation, Inc.
+   Copyright (C) 2014-2016 Free Software Foundation, Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2015.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-catalog-abstract.c b/gettext-tools/src/read-catalog-abstract.c
index eaa624b..6c8d1b5 100644
--- a/gettext-tools/src/read-catalog-abstract.c
+++ b/gettext-tools/src/read-catalog-abstract.c
@@ -1,5 +1,5 @@
 /* Reading PO files, abstract class.
-   Copyright (C) 1995-1996, 1998, 2000-2009, 2015 Free Software
+   Copyright (C) 1995-1996, 1998, 2000-2009, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/read-catalog-abstract.h b/gettext-tools/src/read-catalog-abstract.h
index 7f6dbfa..1581ae3 100644
--- a/gettext-tools/src/read-catalog-abstract.h
+++ b/gettext-tools/src/read-catalog-abstract.h
@@ -1,6 +1,6 @@
 /* Reading PO files, abstract class.
    Copyright (C) 1995-1996, 1998, 2000-2003, 2005-2006, 2008-2009, 2012,
-   2015 Free Software Foundation, Inc.
+   2015-2016 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
diff --git a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c
index 8a26581..571d18e 100644
--- a/gettext-tools/src/read-catalog.c
+++ b/gettext-tools/src/read-catalog.c
@@ -1,5 +1,5 @@
 /* Reading PO files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2015 Free
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2015-2016 Free
    Software Foundation, Inc.
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
diff --git a/gettext-tools/src/read-catalog.h b/gettext-tools/src/read-catalog.h
index f50bcb0..5075fc1 100644
--- a/gettext-tools/src/read-catalog.h
+++ b/gettext-tools/src/read-catalog.h
@@ -1,5 +1,5 @@
 /* Reading PO files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2015 Free
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2015-2016 Free
    Software Foundation, Inc.
    This file was written by Bruno Haible <haible@clisp.cons.org>.
 
diff --git a/gettext-tools/src/read-csharp.c b/gettext-tools/src/read-csharp.c
index c2b3879..27abcb9 100644
--- a/gettext-tools/src/read-csharp.c
+++ b/gettext-tools/src/read-csharp.c
@@ -1,5 +1,5 @@
 /* Reading C# satellite assemblies.
-   Copyright (C) 2003-2004, 2006-2008, 2011, 2015 Free Software
+   Copyright (C) 2003-2004, 2006-2008, 2011, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/read-csharp.h b/gettext-tools/src/read-csharp.h
index 3e03ccf..15b6a55 100644
--- a/gettext-tools/src/read-csharp.h
+++ b/gettext-tools/src/read-csharp.h
@@ -1,5 +1,5 @@
 /* Reading C# satellite assemblies.
-   Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-desktop.c b/gettext-tools/src/read-desktop.c
index 0de123c..e505045 100644
--- a/gettext-tools/src/read-desktop.c
+++ b/gettext-tools/src/read-desktop.c
@@ -1,6 +1,6 @@
 /* Reading Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2015
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2016 Free
+   Software Foundation, Inc.
    This file was written by Daiki Ueno <ueno@gnu.org>.
 
    This program is free software: you can redistribute it and/or modify
@@ -326,8 +326,9 @@ desktop_lex (token_ty *tp)
         case '0': case '1': case '2': case '3': case '4':
         case '5': case '6': case '7': case '8': case '9':
           {
-            const char *locale = NULL;
-            const char *value = NULL;
+            size_t locale_start;
+            bool found_locale = false;
+            size_t value_start;
             for (;;)
               {
                 APPEND (c);
@@ -353,7 +354,8 @@ desktop_lex (token_ty *tp)
                   case '[':
                     /* Finish the key part and start the locale part.  */
                     APPEND (0);
-                    locale = &buffer[bufpos];
+                    found_locale = true;
+                    locale_start = bufpos;
 
                     for (;;)
                       {
@@ -428,7 +430,7 @@ desktop_lex (token_ty *tp)
                 break;
               }
 
-            value = &buffer[bufpos];
+            value_start = bufpos;
             for (;;)
               {
                 c = phase2_getc ();
@@ -439,8 +441,8 @@ desktop_lex (token_ty *tp)
             APPEND (0);
             tp->type = token_type_pair;
             tp->string = xmemdup (buffer, bufpos);
-            tp->locale = locale;
-            tp->value = value;
+            tp->locale = found_locale ? &buffer[locale_start] : NULL;
+            tp->value = &buffer[value_start];
             return;
           }
         default:
diff --git a/gettext-tools/src/read-desktop.h b/gettext-tools/src/read-desktop.h
index eebd681..f3e1b00 100644
--- a/gettext-tools/src/read-desktop.h
+++ b/gettext-tools/src/read-desktop.h
@@ -1,6 +1,6 @@
 /* Reading Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2015
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2016 Free
+   Software Foundation, Inc.
    This file was written by Daiki Ueno <ueno@gnu.org>.
 
    This program is free software: you can redistribute it and/or modify
@@ -85,34 +85,37 @@ struct desktop_reader_ty
   DESKTOP_READER_TY
 };
 
-desktop_reader_ty *desktop_reader_alloc (desktop_reader_class_ty *methods);
-void desktop_reader_free (desktop_reader_ty *reader);
+extern desktop_reader_ty *
+       desktop_reader_alloc (desktop_reader_class_ty *methods);
+extern void desktop_reader_free (desktop_reader_ty *reader);
 
-void desktop_reader_handle_group (desktop_reader_ty *reader,
-                                  const char *group);
+extern void desktop_reader_handle_group (desktop_reader_ty *reader,
+                                         const char *group);
 
-void desktop_reader_handle_pair (desktop_reader_ty *reader,
-                                 lex_pos_ty *key_pos,
+extern void desktop_reader_handle_pair (desktop_reader_ty *reader,
+                                        lex_pos_ty *key_pos,
                                  const char *key,
                                  const char *locale,
                                  const char *value);
 
-void desktop_reader_handle_comment (desktop_reader_ty *reader,
-                                    const char *s);
+extern void desktop_reader_handle_comment (desktop_reader_ty *reader,
+                                           const char *s);
 
-void desktop_reader_handle_blank (desktop_reader_ty *reader,
-                                  const char *s);
+extern void desktop_reader_handle_blank (desktop_reader_ty *reader,
+                                         const char *s);
 
 
-void desktop_parse (desktop_reader_ty *reader, FILE *file,
-                    const char *real_filename, const char *logical_filename);
+extern void desktop_parse (desktop_reader_ty *reader, FILE *file,
+                           const char *real_filename,
+                           const char *logical_filename);
 
 
-char *desktop_escape_string (const char *s, bool is_list);
-char *desktop_unescape_string (const char *s, bool is_list);
+extern char *desktop_escape_string (const char *s, bool is_list);
+extern char *desktop_unescape_string (const char *s, bool is_list);
 
-void desktop_add_keyword (hash_table *keywords, const char *name, bool is_list);
-void desktop_add_default_keywords (hash_table *keywords);
+extern void desktop_add_keyword (hash_table *keywords, const char *name,
+                                 bool is_list);
+extern void desktop_add_default_keywords (hash_table *keywords);
 
 #ifdef __cplusplus
 }
diff --git a/gettext-tools/src/read-java.c b/gettext-tools/src/read-java.c
index 1e1cce0..0eb5ed5 100644
--- a/gettext-tools/src/read-java.c
+++ b/gettext-tools/src/read-java.c
@@ -1,5 +1,5 @@
 /* Reading Java ResourceBundles.
-   Copyright (C) 2001-2003, 2006-2008, 2011, 2015 Free Software
+   Copyright (C) 2001-2003, 2006-2008, 2011, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/read-java.h b/gettext-tools/src/read-java.h
index 169263b..4f4c944 100644
--- a/gettext-tools/src/read-java.h
+++ b/gettext-tools/src/read-java.h
@@ -1,5 +1,5 @@
 /* Reading Java ResourceBundles.
-   Copyright (C) 2001-2002, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-mo.c b/gettext-tools/src/read-mo.c
index c3bfb22..9ddd6b2 100644
--- a/gettext-tools/src/read-mo.c
+++ b/gettext-tools/src/read-mo.c
@@ -1,6 +1,5 @@
 /* Reading binary .mo files.
-   Copyright (C) 1995-1998, 2000-2007, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1998, 2000-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-mo.h b/gettext-tools/src/read-mo.h
index d5f8f58..5872b79 100644
--- a/gettext-tools/src/read-mo.h
+++ b/gettext-tools/src/read-mo.h
@@ -1,6 +1,5 @@
 /* Reading binary .mo files.
-   Copyright (C) 1995-1998, 2000-2003, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-po.c b/gettext-tools/src/read-po.c
index 71eebc2..f339fdf 100644
--- a/gettext-tools/src/read-po.c
+++ b/gettext-tools/src/read-po.c
@@ -1,5 +1,5 @@
 /* Reading PO files.
-   Copyright (C) 1995-1996, 1998, 2000-2006, 2015 Free Software
+   Copyright (C) 1995-1996, 1998, 2000-2006, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-po.h b/gettext-tools/src/read-po.h
index aa9c173..064e27a 100644
--- a/gettext-tools/src/read-po.h
+++ b/gettext-tools/src/read-po.h
@@ -1,5 +1,5 @@
 /* Reading PO files.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-properties.c b/gettext-tools/src/read-properties.c
index a4919a4..19e7779 100644
--- a/gettext-tools/src/read-properties.c
+++ b/gettext-tools/src/read-properties.c
@@ -1,5 +1,5 @@
 /* Reading Java .properties files.
-   Copyright (C) 2003, 2005-2007, 2009, 2015 Free Software Foundation,
+   Copyright (C) 2003, 2005-2007, 2009, 2015-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/read-properties.h b/gettext-tools/src/read-properties.h
index bf2279b..33d90ca 100644
--- a/gettext-tools/src/read-properties.h
+++ b/gettext-tools/src/read-properties.h
@@ -1,5 +1,5 @@
 /* Reading Java .properties files.
-   Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-resources.c b/gettext-tools/src/read-resources.c
index d60394e..4a14ccd 100644
--- a/gettext-tools/src/read-resources.c
+++ b/gettext-tools/src/read-resources.c
@@ -1,5 +1,5 @@
 /* Reading C# .resources files.
-   Copyright (C) 2003, 2006-2008, 2011, 2015 Free Software Foundation,
+   Copyright (C) 2003, 2006-2008, 2011, 2015-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/read-resources.h b/gettext-tools/src/read-resources.h
index 58dccef..8a191e9 100644
--- a/gettext-tools/src/read-resources.h
+++ b/gettext-tools/src/read-resources.h
@@ -1,5 +1,5 @@
 /* Reading C# .resources files.
-   Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-stringtable.c b/gettext-tools/src/read-stringtable.c
index 62073c4..a1f3df4 100644
--- a/gettext-tools/src/read-stringtable.c
+++ b/gettext-tools/src/read-stringtable.c
@@ -1,5 +1,5 @@
 /* Reading NeXTstep/GNUstep .strings files.
-   Copyright (C) 2003, 2005-2007, 2009, 2015 Free Software Foundation,
+   Copyright (C) 2003, 2005-2007, 2009, 2015-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/read-stringtable.h b/gettext-tools/src/read-stringtable.h
index 6c3e069..939a67f 100644
--- a/gettext-tools/src/read-stringtable.h
+++ b/gettext-tools/src/read-stringtable.h
@@ -1,5 +1,5 @@
 /* Reading NeXTstep/GNUstep .strings files.
-   Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/read-tcl.c b/gettext-tools/src/read-tcl.c
index 4191864..bee0d31 100644
--- a/gettext-tools/src/read-tcl.c
+++ b/gettext-tools/src/read-tcl.c
@@ -1,5 +1,5 @@
 /* Reading tcl/msgcat .msg files.
-   Copyright (C) 2002-2003, 2005-2008, 2011, 2015 Free Software
+   Copyright (C) 2002-2003, 2005-2008, 2011, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
diff --git a/gettext-tools/src/read-tcl.h b/gettext-tools/src/read-tcl.h
index d66624d..c3d6549 100644
--- a/gettext-tools/src/read-tcl.h
+++ b/gettext-tools/src/read-tcl.h
@@ -1,5 +1,5 @@
 /* Reading tcl/msgcat .msg files.
-   Copyright (C) 2002, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c
index 44a2f49..3b6724d 100644
--- a/gettext-tools/src/recode-sr-latin.c
+++ b/gettext-tools/src/recode-sr-latin.c
@@ -1,5 +1,5 @@
 /* Recode Serbian text from Cyrillic to Latin script.
-   Copyright (C) 2006-2007, 2010, 2012, 2015 Free Software Foundation,
+   Copyright (C) 2006-2007, 2010, 2012, 2015-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
diff --git a/gettext-tools/src/search-path.c b/gettext-tools/src/search-path.c
new file mode 100644
index 0000000..14b417f
--- /dev/null
+++ b/gettext-tools/src/search-path.c
@@ -0,0 +1,159 @@
+/* Routines for locating data files
+   Copyright (C) 2016 Free Software Foundation, Inc.
+
+   This file was written by Daiki Ueno <ueno@gnu.org>, 2016.
+
+   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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "search-path.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "concat-filename.h"
+#include "relocatable.h"
+#include "xalloc.h"
+#include "xmemdup0.h"
+#include "xvasprintf.h"
+
+typedef void (* foreach_function_ty) (const char *dir, size_t len, void *data);
+
+struct path_array_ty {
+  char **ptr;
+  size_t len;
+  const char *sub;
+};
+
+static void
+foreach_elements (const char *dirs, foreach_function_ty function, void *data)
+{
+  const char *start = dirs;
+
+  /* Count the number of valid elements in GETTEXTDATADIRS.  */
+  while (*start != '\0')
+    {
+      char *end = strchrnul (start, ':');
+
+      /* Skip empty element.  */
+      if (start != end)
+        function (start, end - start, data);
+
+      if (*end == '\0')
+        break;
+
+      start = end + 1;
+    }
+}
+
+static void
+increment (const char *dir, size_t len, void *data)
+{
+  size_t *count = data;
+  (*count)++;
+}
+
+static void
+fill (const char *dir, size_t len, void *data)
+{
+  struct path_array_ty *array = data;
+  char *base, *name;
+
+  base = xmemdup0 (dir, len);
+  if (array->sub == NULL)
+    name = base;
+  else
+    {
+      name = xconcatenated_filename (base, array->sub, NULL);
+      free (base);
+    }
+
+  array->ptr[array->len++] = name;
+}
+
+/* Find the standard search path for data files.  Returns a NULL
+   terminated list of strings.  The order in the path is as follows:
+
+   1. $GETTEXTDATADIR or GETTEXTDATADIR
+   2. $GETTEXTDATADIRS
+   3. $XDG_DATA_DIRS, where each element is suffixed with "gettext"
+   4. $GETTEXTDATADIR or GETTEXTDATADIR, suffixed with PACKAGE_SUFFIX  */
+char **
+get_search_path (const char *sub)
+{
+  const char *gettextdatadir;
+  const char *gettextdatadirs;
+  struct path_array_ty array;
+  char *base, *name;
+  size_t count = 2;
+
+  gettextdatadirs = getenv ("GETTEXTDATADIRS");
+  if (gettextdatadirs != NULL)
+    foreach_elements (gettextdatadirs, increment, &count);
+
+  gettextdatadirs = getenv ("XDG_DATA_DIRS");
+  if (gettextdatadirs != NULL)
+    foreach_elements (gettextdatadirs, increment, &count);
+
+  array.ptr = XCALLOC (count + 1, char *);
+  array.len = 0;
+
+  gettextdatadir = getenv ("GETTEXTDATADIR");
+  if (gettextdatadir == NULL || gettextdatadir[0] == '\0')
+    /* Make it possible to override the locator file location.  This
+       is necessary for running the testsuite before "make
+       install".  */
+    gettextdatadir = relocate (GETTEXTDATADIR);
+
+  /* Append element from GETTEXTDATADIR.  */
+  if (sub == NULL)
+    name = xstrdup (gettextdatadir);
+  else
+    name = xconcatenated_filename (gettextdatadir, sub, NULL);
+  array.ptr[array.len++] = name;
+
+  /* Append elements from GETTEXTDATADIRS.  */
+  array.sub = sub;
+  gettextdatadirs = getenv ("GETTEXTDATADIRS");
+  if (gettextdatadirs != NULL)
+    foreach_elements (gettextdatadirs, fill, &array);
+
+  /* Append elements from XDG_DATA_DIRS.  Note that each element needs
+     to have "gettext" suffix.  */
+  if (sub == NULL)
+    array.sub = xstrdup ("gettext");
+  else
+    array.sub = xconcatenated_filename ("gettext", sub, NULL);
+  gettextdatadirs = getenv ("XDG_DATA_DIRS");
+  if (gettextdatadirs != NULL)
+    foreach_elements (gettextdatadirs, fill, &array);
+  free (array.sub);
+
+  /* Append version specific directory.  */
+  base = xasprintf ("%s%s", gettextdatadir, PACKAGE_SUFFIX);
+  if (sub == NULL)
+    name = base;
+  else
+    {
+      name = xconcatenated_filename (base, sub, NULL);
+      free (base);
+    }
+  array.ptr[array.len++] = name;
+
+  return array.ptr;
+}
diff --git a/gettext-tools/src/search-path.h b/gettext-tools/src/search-path.h
new file mode 100644
index 0000000..6587d23
--- /dev/null
+++ b/gettext-tools/src/search-path.h
@@ -0,0 +1,37 @@
+/* Routines for locating data files
+   Copyright (C) 2016 Free Software Foundation, Inc.
+
+   This file was written by Daiki Ueno <ueno@gnu.org>, 2016.
+
+   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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _SEARCH_PATH_H
+#define _SEARCH_PATH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Find the standard search path for data files.  Returns a NULL
+   terminated list of strings.  If SUB is not NULL, append it to each
+   directory.  */
+extern char **get_search_path (const char *sub);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SEARCH_PATH_H */
diff --git a/gettext-tools/src/sentence.c b/gettext-tools/src/sentence.c
index 0a4883e..fb22bae 100644
--- a/gettext-tools/src/sentence.c
+++ b/gettext-tools/src/sentence.c
@@ -1,5 +1,5 @@
 /* Sentence handling.
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2015.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/sentence.h b/gettext-tools/src/sentence.h
index 02fdc16..ca3f778 100644
--- a/gettext-tools/src/sentence.h
+++ b/gettext-tools/src/sentence.h
@@ -1,5 +1,5 @@
 /* Sentence handling.
-   Copyright (C) 2015 Free Software Foundation, Inc.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2015.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/str-list.c b/gettext-tools/src/str-list.c
index 0e3a9ff..23fc836 100644
--- a/gettext-tools/src/str-list.c
+++ b/gettext-tools/src/str-list.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995, 1998, 2000-2004, 2006, 2009, 2015 Free Software
+   Copyright (C) 1995, 1998, 2000-2004, 2006, 2009, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/str-list.h b/gettext-tools/src/str-list.h
index 0758171..ec81839 100644
--- a/gettext-tools/src/str-list.h
+++ b/gettext-tools/src/str-list.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1996, 1998, 2000-2004, 2009, 2015 Free Software
+   Copyright (C) 1995-1996, 1998, 2000-2004, 2009, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index 482144c..5ac06f0 100644
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -1,5 +1,5 @@
 /* Get the contents of an URL.
-   Copyright (C) 2001-2003, 2005-2010, 2012, 2015 Free Software
+   Copyright (C) 2001-2003, 2005-2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/user-email.sh.in b/gettext-tools/src/user-email.sh.in
index d5b5e49..5e8c4b2 100644
--- a/gettext-tools/src/user-email.sh.in
+++ b/gettext-tools/src/user-email.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Prints the user's email address, with confirmation from the user.
 #
-# Copyright (C) 2001-2003, 2005, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2015-2016 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
diff --git a/gettext-tools/src/write-catalog.c b/gettext-tools/src/write-catalog.c
index 4649efa..1b6959d 100644
--- a/gettext-tools/src/write-catalog.c
+++ b/gettext-tools/src/write-catalog.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2008, 2012, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2008, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-catalog.h b/gettext-tools/src/write-catalog.h
index 7cb18b8..6797d5c 100644
--- a/gettext-tools/src/write-catalog.h
+++ b/gettext-tools/src/write-catalog.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2003, 2006, 2008, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2003, 2006, 2008, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-csharp.c b/gettext-tools/src/write-csharp.c
index dd757ed..5cf573a 100644
--- a/gettext-tools/src/write-csharp.c
+++ b/gettext-tools/src/write-csharp.c
@@ -1,5 +1,5 @@
 /* Writing C# satellite assemblies.
-   Copyright (C) 2003-2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-csharp.h b/gettext-tools/src/write-csharp.h
index 509f8c1..2a6fbff 100644
--- a/gettext-tools/src/write-csharp.h
+++ b/gettext-tools/src/write-csharp.h
@@ -1,5 +1,5 @@
 /* Writing C# satellite assemblies.
-   Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-desktop.c b/gettext-tools/src/write-desktop.c
index 6cf1db7..898ac30 100644
--- a/gettext-tools/src/write-desktop.c
+++ b/gettext-tools/src/write-desktop.c
@@ -1,6 +1,6 @@
 /* Writing Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2015
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2016 Free
+   Software Foundation, Inc.
    This file was written by Daiki Ueno <ueno@gnu.org>.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-desktop.h b/gettext-tools/src/write-desktop.h
index d6408e2..2941d6c 100644
--- a/gettext-tools/src/write-desktop.h
+++ b/gettext-tools/src/write-desktop.h
@@ -1,6 +1,6 @@
 /* Reading Desktop Entry files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2015
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2016 Free
+   Software Foundation, Inc.
    This file was written by Daiki Ueno <ueno@gnu.org>.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c
index a21c002..eef8c79 100644
--- a/gettext-tools/src/write-java.c
+++ b/gettext-tools/src/write-java.c
@@ -1,6 +1,5 @@
 /* Writing Java ResourceBundles.
-   Copyright (C) 2001-2003, 2005-2010, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2003, 2005-2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-java.h b/gettext-tools/src/write-java.h
index 2bebc1f..031ecda 100644
--- a/gettext-tools/src/write-java.h
+++ b/gettext-tools/src/write-java.h
@@ -1,5 +1,5 @@
 /* Writing Java ResourceBundles.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-mo.c b/gettext-tools/src/write-mo.c
index 92dbbe4..b4a7894 100644
--- a/gettext-tools/src/write-mo.c
+++ b/gettext-tools/src/write-mo.c
@@ -1,6 +1,5 @@
 /* Writing binary .mo files.
-   Copyright (C) 1995-1998, 2000-2007, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1998, 2000-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-mo.h b/gettext-tools/src/write-mo.h
index 249ed58..b438d0a 100644
--- a/gettext-tools/src/write-mo.h
+++ b/gettext-tools/src/write-mo.h
@@ -1,5 +1,5 @@
 /* Writing binary .mo files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2015-2016 Free Software
    Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c
index ec413d4..7699455 100644
--- a/gettext-tools/src/write-po.c
+++ b/gettext-tools/src/write-po.c
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2010, 2012, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/write-po.h b/gettext-tools/src/write-po.h
index ee8313a..21d39c7 100644
--- a/gettext-tools/src/write-po.h
+++ b/gettext-tools/src/write-po.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000-2003, 2006, 2008, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2003, 2006, 2008, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/write-properties.c b/gettext-tools/src/write-properties.c
index 4aaf923..e4647c7 100644
--- a/gettext-tools/src/write-properties.c
+++ b/gettext-tools/src/write-properties.c
@@ -1,5 +1,5 @@
 /* Writing Java .properties files.
-   Copyright (C) 2003, 2005-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-properties.h b/gettext-tools/src/write-properties.h
index b29154e..cf6f86c 100644
--- a/gettext-tools/src/write-properties.h
+++ b/gettext-tools/src/write-properties.h
@@ -1,5 +1,5 @@
 /* Writing Java .properties files.
-   Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-qt.c b/gettext-tools/src/write-qt.c
index 42b2d84..978bf09 100644
--- a/gettext-tools/src/write-qt.c
+++ b/gettext-tools/src/write-qt.c
@@ -1,5 +1,5 @@
 /* Writing Qt .qm files.
-   Copyright (C) 2003, 2005-2007, 2009, 2015 Free Software Foundation,
+   Copyright (C) 2003, 2005-2007, 2009, 2015-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/write-qt.h b/gettext-tools/src/write-qt.h
index d83622a..bd5c2d4 100644
--- a/gettext-tools/src/write-qt.h
+++ b/gettext-tools/src/write-qt.h
@@ -1,5 +1,5 @@
 /* Writing Qt .qm files.
-   Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-resources.c b/gettext-tools/src/write-resources.c
index 2fa7e48..e5103c4 100644
--- a/gettext-tools/src/write-resources.c
+++ b/gettext-tools/src/write-resources.c
@@ -1,5 +1,5 @@
 /* Writing C# .resources files.
-   Copyright (C) 2003, 2005, 2007-2009, 2011, 2015 Free Software
+   Copyright (C) 2003, 2005, 2007-2009, 2011, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/write-resources.h b/gettext-tools/src/write-resources.h
index 2508816..47407f2 100644
--- a/gettext-tools/src/write-resources.h
+++ b/gettext-tools/src/write-resources.h
@@ -1,5 +1,5 @@
 /* Writing C# .resources files.
-   Copyright (C) 2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-stringtable.c b/gettext-tools/src/write-stringtable.c
index 8846ac7..4364375 100644
--- a/gettext-tools/src/write-stringtable.c
+++ b/gettext-tools/src/write-stringtable.c
@@ -1,5 +1,5 @@
 /* Writing NeXTstep/GNUstep .strings files.
-   Copyright (C) 2003, 2006-2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2008, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-stringtable.h b/gettext-tools/src/write-stringtable.h
index 4e60dc2..bf3de6c 100644
--- a/gettext-tools/src/write-stringtable.h
+++ b/gettext-tools/src/write-stringtable.h
@@ -1,5 +1,5 @@
 /* Writing NeXTstep/GNUstep .strings files.
-   Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-tcl.c b/gettext-tools/src/write-tcl.c
index 1439431..0dbe3aa 100644
--- a/gettext-tools/src/write-tcl.c
+++ b/gettext-tools/src/write-tcl.c
@@ -1,5 +1,5 @@
 /* Writing tcl/msgcat .msg files.
-   Copyright (C) 2002-2003, 2005, 2007-2009, 2015 Free Software
+   Copyright (C) 2002-2003, 2005, 2007-2009, 2015-2016 Free Software
    Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
diff --git a/gettext-tools/src/write-tcl.h b/gettext-tools/src/write-tcl.h
index b10aa16..f25d04a 100644
--- a/gettext-tools/src/write-tcl.h
+++ b/gettext-tools/src/write-tcl.h
@@ -1,5 +1,5 @@
 /* Writing tcl/msgcat .msg files.
-   Copyright (C) 2002-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-xml.c b/gettext-tools/src/write-xml.c
index 38e3195..79b7b5d 100644
--- a/gettext-tools/src/write-xml.c
+++ b/gettext-tools/src/write-xml.c
@@ -1,6 +1,6 @@
 /* Writing XML files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2015
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2016 Free
+   Software Foundation, Inc.
    This file was written by Daiki Ueno <ueno@gnu.org>.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/write-xml.h b/gettext-tools/src/write-xml.h
index e627789..c4b227b 100644
--- a/gettext-tools/src/write-xml.h
+++ b/gettext-tools/src/write-xml.h
@@ -1,6 +1,6 @@
 /* Reading XML files.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2015
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2014-2016 Free
+   Software Foundation, Inc.
    This file was written by Daiki Ueno <ueno@gnu.org>.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-appdata.h b/gettext-tools/src/x-appdata.h
index 6171673..42a51b9 100644
--- a/gettext-tools/src/x-appdata.h
+++ b/gettext-tools/src/x-appdata.h
@@ -1,5 +1,5 @@
 /* xgettext AppData file backend.
-   Copyright (C) 2002-2003, 2006, 2013, 2015 Free Software Foundation,
+   Copyright (C) 2002-2003, 2006, 2013, 2015-2016 Free Software Foundation,
    Inc.
    Written by Philip Withnall <philip.withnall@collabora.co.uk>, 2015.
 
diff --git a/gettext-tools/src/x-awk.c b/gettext-tools/src/x-awk.c
index 648befe..f2ff310 100644
--- a/gettext-tools/src/x-awk.c
+++ b/gettext-tools/src/x-awk.c
@@ -1,6 +1,5 @@
 /* xgettext awk backend.
-   Copyright (C) 2002-2003, 2005-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002-2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
diff --git a/gettext-tools/src/x-awk.h b/gettext-tools/src/x-awk.h
index b0c1448..c37867c 100644
--- a/gettext-tools/src/x-awk.h
+++ b/gettext-tools/src/x-awk.h
@@ -1,5 +1,5 @@
 /* xgettext awk backend.
-   Copyright (C) 2002-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index 68e9f5d..1844a5d 100644
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -1,5 +1,5 @@
 /* xgettext C/C++/ObjectiveC backend.
-   Copyright (C) 1995-1998, 2000-2009, 2012, 2015 Free Software
+   Copyright (C) 1995-1998, 2000-2009, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/x-c.h b/gettext-tools/src/x-c.h
index 9dc82b0..36e1cb6 100644
--- a/gettext-tools/src/x-c.h
+++ b/gettext-tools/src/x-c.h
@@ -1,5 +1,5 @@
 /* xgettext C/C++/ObjectiveC backend.
-   Copyright (C) 2001-2003, 2006, 2009, 2015 Free Software Foundation,
+   Copyright (C) 2001-2003, 2006, 2009, 2015-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c
index 8bb87d4..2890d27 100644
--- a/gettext-tools/src/x-csharp.c
+++ b/gettext-tools/src/x-csharp.c
@@ -1,5 +1,5 @@
 /* xgettext C# backend.
-   Copyright (C) 2003, 2005-2009, 2011, 2015 Free Software Foundation,
+   Copyright (C) 2003, 2005-2009, 2011, 2015-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
diff --git a/gettext-tools/src/x-csharp.h b/gettext-tools/src/x-csharp.h
index e3c6173..e4c6d01 100644
--- a/gettext-tools/src/x-csharp.h
+++ b/gettext-tools/src/x-csharp.h
@@ -1,5 +1,5 @@
 /* xgettext C# backend.
-   Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-desktop.c b/gettext-tools/src/x-desktop.c
index e4ce5b3..3f382ff 100644
--- a/gettext-tools/src/x-desktop.c
+++ b/gettext-tools/src/x-desktop.c
@@ -1,5 +1,5 @@
 /* xgettext Desktop Entry backend.
-   Copyright (C) 2014-2015 Free Software Foundation, Inc.
+   Copyright (C) 2014-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2014.
 
diff --git a/gettext-tools/src/x-desktop.h b/gettext-tools/src/x-desktop.h
index a5c954b..4a820e5 100644
--- a/gettext-tools/src/x-desktop.h
+++ b/gettext-tools/src/x-desktop.h
@@ -1,5 +1,5 @@
 /* xgettext Desktop Entry backend.
-   Copyright (C) 2014-2015 Free Software Foundation, Inc.
+   Copyright (C) 2014-2016 Free Software Foundation, Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2014.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-elisp.c b/gettext-tools/src/x-elisp.c
index bbe7121..8814136 100644
--- a/gettext-tools/src/x-elisp.c
+++ b/gettext-tools/src/x-elisp.c
@@ -1,6 +1,5 @@
 /* xgettext Emacs Lisp backend.
-   Copyright (C) 2001-2003, 2005-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001-2002.
 
diff --git a/gettext-tools/src/x-elisp.h b/gettext-tools/src/x-elisp.h
index 618a495..1ca0160 100644
--- a/gettext-tools/src/x-elisp.h
+++ b/gettext-tools/src/x-elisp.h
@@ -1,5 +1,5 @@
 /* xgettext Emacs Lisp backend.
-   Copyright (C) 2002-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-glade.h b/gettext-tools/src/x-glade.h
index fda5876..6ec5040 100644
--- a/gettext-tools/src/x-glade.h
+++ b/gettext-tools/src/x-glade.h
@@ -1,5 +1,5 @@
 /* xgettext glade backend.
-   Copyright (C) 2002-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-gsettings.h b/gettext-tools/src/x-gsettings.h
index 00b968c..23637d7 100644
--- a/gettext-tools/src/x-gsettings.h
+++ b/gettext-tools/src/x-gsettings.h
@@ -1,5 +1,5 @@
 /* xgettext GSettings schema file backend.
-   Copyright (C) 2002-2003, 2006, 2013, 2015 Free Software Foundation,
+   Copyright (C) 2002-2003, 2006, 2013, 2015-2016 Free Software Foundation,
    Inc.
    Written by Daiki Ueno <ueno@gnu.org>, 2013.
 
diff --git a/gettext-tools/src/x-java.c b/gettext-tools/src/x-java.c
index 3bc75fe..626382b 100644
--- a/gettext-tools/src/x-java.c
+++ b/gettext-tools/src/x-java.c
@@ -1,5 +1,5 @@
 /* xgettext Java backend.
-   Copyright (C) 2003, 2005-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-java.h b/gettext-tools/src/x-java.h
index 2719c42..f9cdacb 100644
--- a/gettext-tools/src/x-java.h
+++ b/gettext-tools/src/x-java.h
@@ -1,5 +1,5 @@
 /* xgettext Java backend.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Tommy Johansson <tommy.johansson@kanalen.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-javascript.c b/gettext-tools/src/x-javascript.c
index bc4d4c8..6320288 100644
--- a/gettext-tools/src/x-javascript.c
+++ b/gettext-tools/src/x-javascript.c
@@ -1,5 +1,5 @@
 /* xgettext JavaScript backend.
-   Copyright (C) 2002-2003, 2005-2009, 2013, 2015 Free Software
+   Copyright (C) 2002-2003, 2005-2009, 2013, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Andreas Stricker <andy@knitter.ch>, 2010
diff --git a/gettext-tools/src/x-javascript.h b/gettext-tools/src/x-javascript.h
index 5d2d980..e23c85e 100644
--- a/gettext-tools/src/x-javascript.h
+++ b/gettext-tools/src/x-javascript.h
@@ -1,5 +1,5 @@
 /* xgettext JavaScript backend.
-   Copyright (C) 2002-2003, 2006, 2013, 2015 Free Software Foundation,
+   Copyright (C) 2002-2003, 2006, 2013, 2015-2016 Free Software Foundation,
    Inc.
    This file was written by Andreas Stricker <andy@knitter.ch>, 2010.
    It's based on x-python from Bruno Haible.
diff --git a/gettext-tools/src/x-librep.c b/gettext-tools/src/x-librep.c
index a515f29..e00261a 100644
--- a/gettext-tools/src/x-librep.c
+++ b/gettext-tools/src/x-librep.c
@@ -1,6 +1,5 @@
 /* xgettext librep backend.
-   Copyright (C) 2001-2003, 2005-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/x-librep.h b/gettext-tools/src/x-librep.h
index 129a6c3..41b1c9d 100644
--- a/gettext-tools/src/x-librep.h
+++ b/gettext-tools/src/x-librep.h
@@ -1,5 +1,5 @@
 /* xgettext librep backend.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-lisp.c b/gettext-tools/src/x-lisp.c
index 0d3a1c4..b53ee35 100644
--- a/gettext-tools/src/x-lisp.c
+++ b/gettext-tools/src/x-lisp.c
@@ -1,6 +1,5 @@
 /* xgettext Lisp backend.
-   Copyright (C) 2001-2003, 2005-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/x-lisp.h b/gettext-tools/src/x-lisp.h
index e9d0a0b..011efcf 100644
--- a/gettext-tools/src/x-lisp.h
+++ b/gettext-tools/src/x-lisp.h
@@ -1,5 +1,5 @@
 /* xgettext Lisp backend.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-lua.c b/gettext-tools/src/x-lua.c
index 5050838..78ac24f 100644
--- a/gettext-tools/src/x-lua.c
+++ b/gettext-tools/src/x-lua.c
@@ -1,5 +1,5 @@
 /* xgettext Lua backend.
-   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 Free Software Foundation, Inc.
 
    This file was written by Ľubomír Remák <lubomirr@lubomirr.eu>, 2012.
 
@@ -451,6 +451,12 @@ string_add (int c)
 static void
 string_end ()
 {
+  if (string_buf_length >= string_buf_alloc)
+    {
+      string_buf_alloc = string_buf_alloc + 1;
+      string_buf = xrealloc (string_buf, string_buf_alloc);
+    }
+
   string_buf[string_buf_length] = '\0';
 }
 
diff --git a/gettext-tools/src/x-lua.h b/gettext-tools/src/x-lua.h
index 7af3525..1967242 100644
--- a/gettext-tools/src/x-lua.h
+++ b/gettext-tools/src/x-lua.h
@@ -1,5 +1,5 @@
 /* xgettext Lua backend.
-   Copyright (C) 2011, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2015-2016 Free Software Foundation, Inc.
    Written by Ľubomír Remák <lubomirrk@lubomirr.eu>, 2011
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c
index 396b7b5..ea903dc 100644
--- a/gettext-tools/src/x-perl.c
+++ b/gettext-tools/src/x-perl.c
@@ -1,5 +1,5 @@
 /* xgettext Perl backend.
-   Copyright (C) 2002-2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2010, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Guido Flohr <guido@imperia.net>, 2002-2010.
 
diff --git a/gettext-tools/src/x-perl.h b/gettext-tools/src/x-perl.h
index 4f7a2b3..5873abe 100644
--- a/gettext-tools/src/x-perl.h
+++ b/gettext-tools/src/x-perl.h
@@ -1,5 +1,5 @@
 /* xgettext Perl backend.
-   Copyright (C) 2002-2003, 2006, 2010, 2015 Free Software Foundation,
+   Copyright (C) 2002-2003, 2006, 2010, 2015-2016 Free Software Foundation,
    Inc.
    Written by Guido Flohr <guido@imperia.net>, 2002-2003
 
diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
index ac5cf96..6418e07 100644
--- a/gettext-tools/src/x-php.c
+++ b/gettext-tools/src/x-php.c
@@ -1,6 +1,5 @@
 /* xgettext PHP backend.
-   Copyright (C) 2001-2003, 2005-2010, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2003, 2005-2010, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <bruno@clisp.org>, 2002.
 
diff --git a/gettext-tools/src/x-php.h b/gettext-tools/src/x-php.h
index 0d13fee..e676742 100644
--- a/gettext-tools/src/x-php.h
+++ b/gettext-tools/src/x-php.h
@@ -1,5 +1,5 @@
 /* xgettext PHP backend.
-   Copyright (C) 2002-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-po.c b/gettext-tools/src/x-po.c
index 65d8cc0..d16fd7d 100644
--- a/gettext-tools/src/x-po.c
+++ b/gettext-tools/src/x-po.c
@@ -1,5 +1,5 @@
 /* xgettext PO and JavaProperties backends.
-   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2015 Free
+   Copyright (C) 1995-1998, 2000-2003, 2005-2006, 2008-2009, 2015-2016 Free
    Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
diff --git a/gettext-tools/src/x-po.h b/gettext-tools/src/x-po.h
index e76d77b..030485f 100644
--- a/gettext-tools/src/x-po.h
+++ b/gettext-tools/src/x-po.h
@@ -1,5 +1,5 @@
 /* xgettext PO backend.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-properties.h b/gettext-tools/src/x-properties.h
index 0935466..40a7f0a 100644
--- a/gettext-tools/src/x-properties.h
+++ b/gettext-tools/src/x-properties.h
@@ -1,5 +1,5 @@
 /* xgettext JavaProperties backend.
-   Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index 8122c34..d0e8894 100644
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -1,6 +1,5 @@
 /* xgettext Python backend.
-   Copyright (C) 2002-2003, 2005-2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002-2003, 2005-2016 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
diff --git a/gettext-tools/src/x-python.h b/gettext-tools/src/x-python.h
index 57d379d..64d4d6c 100644
--- a/gettext-tools/src/x-python.h
+++ b/gettext-tools/src/x-python.h
@@ -1,5 +1,5 @@
 /* xgettext Python backend.
-   Copyright (C) 2002-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-rst.c b/gettext-tools/src/x-rst.c
index f673299..acaadf4 100644
--- a/gettext-tools/src/x-rst.c
+++ b/gettext-tools/src/x-rst.c
@@ -1,6 +1,5 @@
 /* xgettext RST backend.
-   Copyright (C) 2001-2003, 2005-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001-2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/src/x-rst.h b/gettext-tools/src/x-rst.h
index a6ac552..7515498 100644
--- a/gettext-tools/src/x-rst.h
+++ b/gettext-tools/src/x-rst.h
@@ -1,5 +1,5 @@
 /* xgettext RST backend.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-scheme.c b/gettext-tools/src/x-scheme.c
index abbe0e5..0a9a9ef 100644
--- a/gettext-tools/src/x-scheme.c
+++ b/gettext-tools/src/x-scheme.c
@@ -1,5 +1,5 @@
 /* xgettext Scheme backend.
-   Copyright (C) 2004-2009, 2011, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2004-2009, 2011, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <bruno@clisp.org>, 2004-2005.
 
diff --git a/gettext-tools/src/x-scheme.h b/gettext-tools/src/x-scheme.h
index 039979f..3e5cd2c 100644
--- a/gettext-tools/src/x-scheme.h
+++ b/gettext-tools/src/x-scheme.h
@@ -1,5 +1,5 @@
 /* xgettext Scheme backend.
-   Copyright (C) 2004, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2004.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-sh.c b/gettext-tools/src/x-sh.c
index 3746a9a..c0da366 100644
--- a/gettext-tools/src/x-sh.c
+++ b/gettext-tools/src/x-sh.c
@@ -1,5 +1,5 @@
 /* xgettext sh backend.
-   Copyright (C) 2003, 2005-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-sh.h b/gettext-tools/src/x-sh.h
index a31eeff..20bd427 100644
--- a/gettext-tools/src/x-sh.h
+++ b/gettext-tools/src/x-sh.h
@@ -1,5 +1,5 @@
 /* xgettext sh backend.
-   Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-smalltalk.c b/gettext-tools/src/x-smalltalk.c
index 9c079cc..de2cee0 100644
--- a/gettext-tools/src/x-smalltalk.c
+++ b/gettext-tools/src/x-smalltalk.c
@@ -1,5 +1,5 @@
 /* xgettext Smalltalk backend.
-   Copyright (C) 2002-2003, 2005-2009, 2011, 2015 Free Software
+   Copyright (C) 2002-2003, 2005-2009, 2011, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
diff --git a/gettext-tools/src/x-smalltalk.h b/gettext-tools/src/x-smalltalk.h
index 9061f29..916177a 100644
--- a/gettext-tools/src/x-smalltalk.h
+++ b/gettext-tools/src/x-smalltalk.h
@@ -1,5 +1,5 @@
 /* xgettext Smalltalk backend.
-   Copyright (C) 2002-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-stringtable.h b/gettext-tools/src/x-stringtable.h
index 2c519e8..10ec744 100644
--- a/gettext-tools/src/x-stringtable.h
+++ b/gettext-tools/src/x-stringtable.h
@@ -1,5 +1,5 @@
 /* xgettext NXStringTable backend.
-   Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-tcl.c b/gettext-tools/src/x-tcl.c
index 905d55c..a566b84 100644
--- a/gettext-tools/src/x-tcl.c
+++ b/gettext-tools/src/x-tcl.c
@@ -1,6 +1,5 @@
 /* xgettext Tcl backend.
-   Copyright (C) 2002-2003, 2005-2009, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002-2003, 2005-2009, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
diff --git a/gettext-tools/src/x-tcl.h b/gettext-tools/src/x-tcl.h
index 00f6fc5..ab8013d 100644
--- a/gettext-tools/src/x-tcl.h
+++ b/gettext-tools/src/x-tcl.h
@@ -1,5 +1,5 @@
 /* xgettext Tcl Lisp backend.
-   Copyright (C) 2002-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-vala.c b/gettext-tools/src/x-vala.c
index 4e53b50..b36ab71 100644
--- a/gettext-tools/src/x-vala.c
+++ b/gettext-tools/src/x-vala.c
@@ -1,5 +1,5 @@
 /* xgettext Vala backend.
-   Copyright (C) 2013, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2013, 2015-2016 Free Software Foundation, Inc.
 
    This file was written by Daiki Ueno <ueno@gnu.org>, 2013.
 
diff --git a/gettext-tools/src/x-vala.h b/gettext-tools/src/x-vala.h
index fcd0cfb..5ce16b1 100644
--- a/gettext-tools/src/x-vala.h
+++ b/gettext-tools/src/x-vala.h
@@ -1,5 +1,5 @@
 /* xgettext Vala backend.
-   Copyright (C) 2002-2003, 2006, 2013, 2015 Free Software Foundation,
+   Copyright (C) 2002-2003, 2006, 2013, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/x-ycp.c b/gettext-tools/src/x-ycp.c
index 62ab94d..f4c6e8e 100644
--- a/gettext-tools/src/x-ycp.c
+++ b/gettext-tools/src/x-ycp.c
@@ -1,5 +1,5 @@
 /* xgettext YCP backend.
-   Copyright (C) 2001-2003, 2005-2009, 2011, 2015 Free Software
+   Copyright (C) 2001-2003, 2005-2009, 2011, 2015-2016 Free Software
    Foundation, Inc.
 
    This file was written by Bruno Haible <haible@clisp.cons.org>, 2001.
diff --git a/gettext-tools/src/x-ycp.h b/gettext-tools/src/x-ycp.h
index 3ecb097..141247c 100644
--- a/gettext-tools/src/x-ycp.h
+++ b/gettext-tools/src/x-ycp.h
@@ -1,5 +1,5 @@
 /* xgettext YCP backend.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 314d35c..f848d76 100644
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -1,6 +1,5 @@
 /* Extracts strings from C source file to Uniforum style .po file.
-   Copyright (C) 1995-1998, 2000-2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1995-1998, 2000-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -74,6 +73,7 @@
 #include "unistr.h"
 #include "its.h"
 #include "locating-rule.h"
+#include "search-path.h"
 #include "gettext.h"
 
 /* A convenience macro.  I don't like writing gettext() every time.  */
@@ -329,7 +329,8 @@ main (int argc, char *argv[])
   bool some_additional_keywords = false;
   bool sort_by_msgid = false;
   bool sort_by_filepos = false;
-  char *its_dirs[2] = { NULL, NULL };
+  char **dirs;
+  char **its_dirs;
   char *explicit_its_filename = NULL;
   const char *file_name;
   const char *files_from = NULL;
@@ -638,13 +639,15 @@ main (int argc, char *argv[])
         break;
 
       case CHAR_MAX + 17: /* --check */
-        if (strcmp (optarg, "ellipsis-unicode") == 0)
-          default_syntax_check[sc_ellipsis_unicode] = yes;
-        else if (strcmp (optarg, "space-ellipsis") == 0)
-          default_syntax_check[sc_space_ellipsis] = yes;
-        else if (strcmp (optarg, "quote-unicode") == 0)
-          default_syntax_check[sc_quote_unicode] = yes;
-        else
+        for (i = 0; i < NSYNTAXCHECKS; i++)
+          {
+            if (strcmp (optarg, syntax_check_name[i]) == 0)
+              {
+                default_syntax_check[i] = yes;
+                break;
+              }
+          }
+        if (i == NSYNTAXCHECKS)
           error (EXIT_FAILURE, 0, _("syntax check '%s' unknown"), optarg);
         break;
 
@@ -680,7 +683,7 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n\
 "),
-              "1995-1998, 2000-2013");
+              "1995-1998, 2000-2016");
       printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));
       exit (EXIT_SUCCESS);
     }
@@ -725,36 +728,20 @@ xgettext cannot work without keywords to look for"));
       usage (EXIT_FAILURE);
     }
 
-  {
-    const char *gettextdatadir;
-    char *versioned_gettextdatadir;
-
-    /* Make it possible to override the locator file location.  This
-       is necessary for running the testsuite before "make
-       install".  */
-    gettextdatadir = getenv ("GETTEXTDATADIR");
-    if (gettextdatadir == NULL || gettextdatadir[0] == '\0')
-      gettextdatadir = relocate (GETTEXTDATADIR);
-
-    its_dirs[0] = xconcatenated_filename (gettextdatadir, "its", NULL);
-
-    versioned_gettextdatadir =
-      xasprintf ("%s%s", relocate (GETTEXTDATADIR), PACKAGE_SUFFIX);
-    its_dirs[1] = xconcatenated_filename (versioned_gettextdatadir, "its",
-                                          NULL);
-    free (versioned_gettextdatadir);
-
-    its_locating_rules = locating_rule_list_alloc ();
-    for (i = 0; i < SIZEOF (its_dirs); i++)
-      locating_rule_list_add_from_directory (its_locating_rules, its_dirs[i]);
-  }
-
   /* Explicit ITS file selection and language specification are
      mutually exclusive.  */
   if (explicit_its_filename != NULL && language != NULL)
     error (EXIT_FAILURE, 0, _("%s and %s are mutually exclusive"),
            "--its", "--language");
 
+  if (explicit_its_filename == NULL)
+    {
+      its_dirs = get_search_path ("its");
+      its_locating_rules = locating_rule_list_alloc ();
+      for (dirs = its_dirs; *dirs != NULL; dirs++)
+        locating_rule_list_add_from_directory (its_locating_rules, *dirs);
+    }
+
   /* Determine extractor from language.  */
   if (language != NULL)
     extractor = language_to_extractor (language);
@@ -929,7 +916,7 @@ warning: ITS rule file '%s' does not exist"), explicit_its_filename);
                     its_rule_list_add_from_string (its_rules,
                                                    ITS_ROOT_UNTRANSLATABLE);
 
-                  for (j = 0; j < SIZEOF (its_dirs); j++)
+                  for (j = 0; its_dirs[j] != NULL; j++)
                     {
                       char *its_filename =
                         xconcatenated_filename (its_dirs[j], its_basename,
@@ -944,7 +931,7 @@ warning: ITS rule file '%s' does not exist"), explicit_its_filename);
                       if (ok)
                         break;
                     }
-                  if (j == SIZEOF (its_dirs))
+                  if (its_dirs[j] == NULL)
                     {
                       error (0, 0, _("\
 warning: ITS rule file '%s' does not exist; check your gettext installation"),
@@ -1029,8 +1016,9 @@ warning: file '%s' extension '%s' is unknown; will try C"), filename, extension)
   if (its_locating_rules)
     locating_rule_list_free (its_locating_rules);
 
-  for (i = 0; i < SIZEOF (its_dirs); i++)
+  for (i = 0; its_dirs[i] != NULL; i++)
     free (its_dirs[i]);
+  free (its_dirs);
 
   exit (EXIT_SUCCESS);
 }
@@ -1117,7 +1105,7 @@ Operation mode:\n"));
       printf (_("\
       --check=NAME            perform syntax check on messages\n\
                                 (ellipsis-unicode, space-ellipsis,\n\
-                                 quote-unicode)\n"));
+                                 quote-unicode, bullet-unicode)\n"));
       printf (_("\
       --sentence-end=TYPE     type describing the end of sentence\n\
                                 (single-space, which is the default, \n\
@@ -1153,6 +1141,10 @@ Language specific options:\n"));
       printf (_("\
                                 (only languages C, C++, ObjectiveC)\n"));
       printf (_("\
+      --its=FILE              apply ITS rules from FILE\n"));
+      printf (_("\
+                                (only XML based languages)\n"));
+      printf (_("\
       --qt                    recognize Qt format strings\n"));
       printf (_("\
                                 (only language C++)\n"));
@@ -1194,8 +1186,6 @@ Output details:\n"));
       printf (_("\
       --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"));
       printf (_("\
-      --its=FILE              apply ITS rules from FILE\n"));
-      printf (_("\
       --itstool               write out itstool comments\n"));
       printf (_("\
   -w, --width=NUMBER          set output page width\n"));
diff --git a/gettext-tools/src/xgettext.h b/gettext-tools/src/xgettext.h
index 167fcd3..5bdf94e 100644
--- a/gettext-tools/src/xgettext.h
+++ b/gettext-tools/src/xgettext.h
@@ -1,6 +1,6 @@
 /* xgettext common functions.
-   Copyright (C) 2001-2003, 2005-2006, 2008-2009, 2011, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2006, 2008-2009, 2011, 2015-2016 Free Software
+   Foundation, Inc.
    Written by Peter Miller <millerp@canb.auug.org.au>
    and Bruno Haible <haible@clisp.cons.org>, 2001.
 
diff --git a/gettext-tools/styles/Makefile.am b/gettext-tools/styles/Makefile.am
index c50ac1b..adae957 100644
--- a/gettext-tools/styles/Makefile.am
+++ b/gettext-tools/styles/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/styles subdirectory of GNU gettext
-## Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+## Copyright (C) 2006-2007, 2015-2016 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
diff --git a/gettext-tools/styles/Makefile.in b/gettext-tools/styles/Makefile.in
index 5d9ca68..57ad095 100644
--- a/gettext-tools/styles/Makefile.in
+++ b/gettext-tools/styles/Makefile.in
@@ -118,6 +118,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -154,6 +155,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
diff --git a/gettext-tools/styles/po-default.css b/gettext-tools/styles/po-default.css
index d535fa4..025bf29 100644
--- a/gettext-tools/styles/po-default.css
+++ b/gettext-tools/styles/po-default.css
@@ -1,5 +1,5 @@
 /* Default styling rules for PO files when doing terminal output.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 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
diff --git a/gettext-tools/styles/po-emacs-x.css b/gettext-tools/styles/po-emacs-x.css
index d78470f..ac775b7 100644
--- a/gettext-tools/styles/po-emacs-x.css
+++ b/gettext-tools/styles/po-emacs-x.css
@@ -1,5 +1,5 @@
 /* Styling rules for PO files, imitating emacs 21 and 22 in an X window.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 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
diff --git a/gettext-tools/styles/po-emacs-xterm.css b/gettext-tools/styles/po-emacs-xterm.css
index 7c839eb..5e442ba 100644
--- a/gettext-tools/styles/po-emacs-xterm.css
+++ b/gettext-tools/styles/po-emacs-xterm.css
@@ -1,5 +1,5 @@
 /* Styling rules for PO files, imitating emacs 22 in an xterm terminal.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 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
diff --git a/gettext-tools/styles/po-emacs-xterm16.css b/gettext-tools/styles/po-emacs-xterm16.css
index 9e75e76..b72ebe2 100644
--- a/gettext-tools/styles/po-emacs-xterm16.css
+++ b/gettext-tools/styles/po-emacs-xterm16.css
@@ -1,5 +1,5 @@
 /* Styling rules for PO files, imitating emacs 22 in an xterm-16color terminal.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 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
diff --git a/gettext-tools/styles/po-emacs-xterm256.css b/gettext-tools/styles/po-emacs-xterm256.css
index c63d43c..c99747d 100644
--- a/gettext-tools/styles/po-emacs-xterm256.css
+++ b/gettext-tools/styles/po-emacs-xterm256.css
@@ -1,5 +1,5 @@
 /* Styling rules for PO files, imitating emacs 22 in an xterm-256color terminal.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 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
diff --git a/gettext-tools/styles/po-vim.css b/gettext-tools/styles/po-vim.css
index 41af15f..e4db145 100644
--- a/gettext-tools/styles/po-vim.css
+++ b/gettext-tools/styles/po-vim.css
@@ -1,5 +1,5 @@
 /* Styling rules for PO files, imitating vim 7.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 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
diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index d3ffb75..23b09b1 100644
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gettext-tools/tests subdirectory of GNU gettext
-## Copyright (C) 1995-1997, 2001-2010, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 1995-1997, 2001-2010, 2015-2016 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
@@ -114,7 +113,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \
 	xgettext-vala-1 \
 	xgettext-gsettings-1 \
 	xgettext-desktop-1 \
-	xgettext-its-1 \
+	xgettext-its-1 xgettext-its-2 \
 	format-awk-1 format-awk-2 \
 	format-boost-1 format-boost-2 \
 	format-c-1 format-c-2 format-c-3 format-c-4 format-c-5 \
@@ -143,7 +142,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \
 	format-lua-1 format-lua-2 \
 	format-javascript-1 format-javascript-2 \
 	plural-1 plural-2 \
-	gettextpo-1 sentence \
+	gettextpo-1 sentence-1 \
 	lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
 	lang-python-2 lang-clisp lang-elisp lang-librep lang-guile \
 	lang-smalltalk lang-java lang-csharp lang-gawk lang-pascal \
@@ -171,7 +170,7 @@ XGETTEXT = ../src/xgettext
 # For debugging memory leaks and memory allocation bugs.
 # You should build with --disable-shared when using valgrind.
 CHECKER =
-#CHECKER = valgrind --tool=memcheck --suppressions=$(srcdir)/../gnulib-lib/malloca.valgrind --suppressions=$(srcdir)/../gnulib-lib/libunistring.valgrind --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes
+#CHECKER = valgrind --tool=memcheck --suppressions=$(abs_srcdir)/../gnulib-lib/malloca.valgrind --suppressions=$(abs_srcdir)/../gnulib-lib/libunistring.valgrind --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes
 #CHECKER = valgrind --tool=massif --format=html --depth=10 --alloc-fn=xmalloc --alloc-fn=xrealloc --stacks=no
 
 TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
@@ -217,7 +216,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@
 LDADD_yes = ../intl/libintl.la @LTLIBTHREAD@
 LDADD_no = ../intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
-check_PROGRAMS = tstgettext tstngettext testlocale gettext-3-prg gettext-4-prg gettext-5-prg gettext-6-prg gettext-7-prg gettext-8-prg cake fc3 fc4 fc5 gettextpo-1-prg sentence
+check_PROGRAMS = tstgettext tstngettext testlocale gettext-3-prg gettext-4-prg gettext-5-prg gettext-6-prg gettext-7-prg gettext-8-prg cake fc3 fc4 fc5 gettextpo-1-prg sentence-1-prg
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_CFLAGS = -DINSTALLDIR=\".\"
 tstgettext_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
@@ -261,9 +260,9 @@ gettextpo_1_prg_CPPFLAGS = \
 # Don't add more libraries here. This test must check whether libgettextpo is
 # self contained.
 gettextpo_1_prg_LDADD = ../libgettextpo/libgettextpo.la $(LDADD)
-sentence_SOURCES = sentence.c
-sentence_CPPFLAGS = $(AM_CPPFLAGS) -I../src -I$(top_srcdir)/src
-sentence_LDADD = ../src/libgettextsrc.la $(LDADD)
+sentence_1_prg_SOURCES = sentence-1-prg.c
+sentence_1_prg_CPPFLAGS = $(AM_CPPFLAGS) -I../src -I$(top_srcdir)/src
+sentence_1_prg_LDADD = ../src/libgettextsrc.la $(LDADD)
 
 # Clean up after Solaris cc.
 clean-local:
diff --git a/gettext-tools/tests/Makefile.in b/gettext-tools/tests/Makefile.in
index f00fa3b..e2fa0e8 100644
--- a/gettext-tools/tests/Makefile.in
+++ b/gettext-tools/tests/Makefile.in
@@ -86,111 +86,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 \
-	gettext-7 gettext-8 msgattrib-1 msgattrib-2 msgattrib-3 \
-	msgattrib-4 msgattrib-5 msgattrib-6 msgattrib-7 msgattrib-8 \
-	msgattrib-9 msgattrib-10 msgattrib-11 msgattrib-12 \
-	msgattrib-13 msgattrib-14 msgattrib-15 msgattrib-16 \
-	msgattrib-17 msgattrib-18 msgattrib-19 msgattrib-properties-1 \
-	msgcat-1 msgcat-2 msgcat-3 msgcat-4 msgcat-5 msgcat-6 msgcat-7 \
-	msgcat-8 msgcat-9 msgcat-10 msgcat-11 msgcat-12 msgcat-13 \
-	msgcat-14 msgcat-15 msgcat-16 msgcat-17 msgcat-18 msgcat-19 \
-	msgcat-20 msgcat-properties-1 msgcat-properties-2 \
-	msgcat-stringtable-1 msgcmp-1 msgcmp-2 msgcmp-3 msgcmp-4 \
-	msgcomm-1 msgcomm-2 msgcomm-3 msgcomm-4 msgcomm-5 msgcomm-6 \
-	msgcomm-7 msgcomm-8 msgcomm-9 msgcomm-10 msgcomm-11 msgcomm-12 \
-	msgcomm-13 msgcomm-14 msgcomm-15 msgcomm-16 msgcomm-17 \
-	msgcomm-18 msgcomm-19 msgcomm-20 msgcomm-21 msgcomm-22 \
-	msgcomm-23 msgcomm-24 msgcomm-25 msgcomm-26 msgcomm-27 \
-	msgcomm-28 msgconv-1 msgconv-2 msgconv-3 msgconv-4 msgconv-5 \
-	msgconv-6 msgconv-7 msgen-1 msgen-2 msgen-3 msgen-4 msgexec-1 \
-	msgexec-2 msgexec-3 msgexec-4 msgexec-5 msgexec-6 msgfilter-1 \
-	msgfilter-2 msgfilter-3 msgfilter-4 msgfilter-5 msgfilter-6 \
-	msgfilter-7 msgfilter-8 msgfilter-sr-latin-1 msgfilter-quote-1 \
-	msgfmt-1 msgfmt-2 msgfmt-3 msgfmt-4 msgfmt-5 msgfmt-6 msgfmt-7 \
-	msgfmt-8 msgfmt-9 msgfmt-10 msgfmt-11 msgfmt-12 msgfmt-13 \
-	msgfmt-14 msgfmt-15 msgfmt-16 msgfmt-17 msgfmt-18 \
-	msgfmt-properties-1 msgfmt-qt-1 msgfmt-qt-2 msgfmt-desktop-1 \
-	msgfmt-desktop-2 msgfmt-xml-1 msgfmt-xml-2 msggrep-1 msggrep-2 \
-	msggrep-3 msggrep-4 msggrep-5 msggrep-6 msggrep-7 msggrep-8 \
-	msggrep-9 msggrep-10 msggrep-11 msginit-1 msginit-2 msginit-3 \
-	msginit-4 msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 \
-	msgmerge-5 msgmerge-6 msgmerge-7 msgmerge-8 msgmerge-9 \
-	msgmerge-10 msgmerge-11 msgmerge-12 msgmerge-13 msgmerge-14 \
-	msgmerge-15 msgmerge-16 msgmerge-17 msgmerge-18 msgmerge-19 \
-	msgmerge-20 msgmerge-21 msgmerge-22 msgmerge-23 msgmerge-24 \
-	msgmerge-25 msgmerge-compendium-1 msgmerge-compendium-2 \
-	msgmerge-compendium-3 msgmerge-compendium-4 \
-	msgmerge-compendium-5 msgmerge-compendium-6 \
-	msgmerge-properties-1 msgmerge-properties-2 msgmerge-update-1 \
-	msgmerge-update-2 msgmerge-update-3 msgmerge-update-4 \
-	msgunfmt-1 msgunfmt-2 msgunfmt-3 msgunfmt-csharp-1 \
-	msgunfmt-java-1 msgunfmt-properties-1 msgunfmt-tcl-1 msguniq-1 \
-	msguniq-2 msguniq-3 msguniq-4 msguniq-5 msguniq-6 msguniq-7 \
-	recode-sr-latin-1 recode-sr-latin-2 xgettext-2 xgettext-3 \
-	xgettext-4 xgettext-5 xgettext-6 xgettext-7 xgettext-8 \
-	xgettext-9 xgettext-10 xgettext-11 xgettext-12 xgettext-13 \
-	xgettext-14 xgettext-appdata-1 xgettext-awk-1 xgettext-awk-2 \
-	xgettext-c-2 xgettext-c-3 xgettext-c-4 xgettext-c-5 \
-	xgettext-c-6 xgettext-c-7 xgettext-c-8 xgettext-c-9 \
-	xgettext-c-10 xgettext-c-11 xgettext-c-12 xgettext-c-13 \
-	xgettext-c-14 xgettext-c-15 xgettext-c-16 xgettext-c-17 \
-	xgettext-c-18 xgettext-c-19 xgettext-c-20 xgettext-c-21 \
-	xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \
-	xgettext-csharp-4 xgettext-csharp-5 xgettext-csharp-6 \
-	xgettext-csharp-7 xgettext-csharp-8 xgettext-elisp-1 \
-	xgettext-elisp-2 xgettext-glade-1 xgettext-glade-2 \
-	xgettext-glade-3 xgettext-glade-4 xgettext-glade-5 \
-	xgettext-glade-6 xgettext-glade-7 xgettext-java-1 \
-	xgettext-java-2 xgettext-java-3 xgettext-java-4 \
-	xgettext-java-5 xgettext-java-6 xgettext-java-7 \
-	xgettext-librep-1 xgettext-librep-2 xgettext-lisp-1 \
-	xgettext-lisp-2 xgettext-objc-1 xgettext-objc-2 \
-	xgettext-perl-1 xgettext-perl-2 xgettext-perl-3 \
-	xgettext-perl-4 xgettext-perl-5 xgettext-perl-6 \
-	xgettext-perl-7 xgettext-perl-8 xgettext-php-1 xgettext-php-2 \
-	xgettext-php-3 xgettext-php-4 xgettext-po-1 \
-	xgettext-properties-1 xgettext-python-1 xgettext-python-2 \
-	xgettext-python-3 xgettext-python-4 xgettext-scheme-1 \
-	xgettext-scheme-2 xgettext-scheme-3 xgettext-scheme-4 \
-	xgettext-sh-1 xgettext-sh-2 xgettext-sh-3 xgettext-sh-4 \
-	xgettext-sh-5 xgettext-sh-6 xgettext-smalltalk-1 \
-	xgettext-smalltalk-2 xgettext-stringtable-1 xgettext-tcl-1 \
-	xgettext-tcl-2 xgettext-tcl-3 xgettext-tcl-4 xgettext-ycp-1 \
-	xgettext-ycp-2 xgettext-ycp-3 xgettext-ycp-4 xgettext-lua-1 \
-	xgettext-lua-2 xgettext-javascript-1 xgettext-javascript-2 \
-	xgettext-javascript-3 xgettext-javascript-4 \
-	xgettext-javascript-5 xgettext-javascript-6 xgettext-vala-1 \
-	xgettext-gsettings-1 xgettext-desktop-1 xgettext-its-1 \
-	format-awk-1 format-awk-2 format-boost-1 format-boost-2 \
-	format-c-1 format-c-2 format-c-3 format-c-4 format-c-5 \
-	format-csharp-1 format-csharp-2 format-elisp-1 format-elisp-2 \
-	format-gcc-internal-1 format-gcc-internal-2 \
-	format-gfc-internal-1 format-gfc-internal-2 format-java-1 \
-	format-java-2 format-kde-1 format-kde-2 format-kde-kuit-1 \
-	format-kde-kuit-2 format-librep-1 format-librep-2 \
-	format-lisp-1 format-lisp-2 format-php-1 format-php-2 \
-	format-python-1 format-python-2 format-python-brace-1 \
-	format-python-brace-2 format-pascal-1 format-pascal-2 \
-	format-perl-1 format-perl-2 format-perl-brace-1 \
-	format-perl-brace-2 format-perl-mixed-1 format-perl-mixed-2 \
-	format-qt-1 format-qt-2 format-qt-plural-1 format-qt-plural-2 \
-	format-scheme-1 format-scheme-2 format-sh-1 format-sh-2 \
-	format-tcl-1 format-tcl-2 format-ycp-1 format-ycp-2 \
-	format-lua-1 format-lua-2 format-javascript-1 \
-	format-javascript-2 plural-1 plural-2 gettextpo-1 \
-	sentence$(EXEEXT) lang-c lang-c++ lang-objc lang-sh lang-bash \
-	lang-python-1 lang-python-2 lang-clisp lang-elisp lang-librep \
-	lang-guile lang-smalltalk lang-java lang-csharp lang-gawk \
-	lang-pascal lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php \
-	lang-po lang-rst lang-lua lang-javascript lang-vala \
-	autopoint-1 autopoint-2 autopoint-3 cldr-plurals-1
 check_PROGRAMS = tstgettext$(EXEEXT) tstngettext$(EXEEXT) \
 	testlocale$(EXEEXT) gettext-3-prg$(EXEEXT) \
 	gettext-4-prg$(EXEEXT) gettext-5-prg$(EXEEXT) \
 	gettext-6-prg$(EXEEXT) gettext-7-prg$(EXEEXT) \
 	gettext-8-prg$(EXEEXT) cake$(EXEEXT) fc3$(EXEEXT) fc4$(EXEEXT) \
-	fc5$(EXEEXT) gettextpo-1-prg$(EXEEXT) sentence$(EXEEXT)
+	fc5$(EXEEXT) gettextpo-1-prg$(EXEEXT) sentence-1-prg$(EXEEXT)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -223,6 +124,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
+	$(top_srcdir)/gnulib-m4/dirfd.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
 	$(top_srcdir)/gnulib-m4/dup.m4 $(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eaccess.m4 \
@@ -259,6 +161,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/gettimeofday.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-common.m4 \
 	$(top_srcdir)/gnulib-m4/gnulib-comp.m4 \
+	$(top_srcdir)/gnulib-m4/hard-locale.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_h.m4 \
 	$(top_srcdir)/gnulib-m4/iconv_open.m4 \
 	$(top_srcdir)/gnulib-m4/include_next.m4 \
@@ -514,9 +417,10 @@ am_gettextpo_1_prg_OBJECTS =  \
 gettextpo_1_prg_OBJECTS = $(am_gettextpo_1_prg_OBJECTS)
 gettextpo_1_prg_DEPENDENCIES = ../libgettextpo/libgettextpo.la \
 	$(am__DEPENDENCIES_1)
-am_sentence_OBJECTS = sentence-sentence.$(OBJEXT)
-sentence_OBJECTS = $(am_sentence_OBJECTS)
-sentence_DEPENDENCIES = ../src/libgettextsrc.la $(am__DEPENDENCIES_1)
+am_sentence_1_prg_OBJECTS = sentence_1_prg-sentence-1-prg.$(OBJEXT)
+sentence_1_prg_OBJECTS = $(am_sentence_1_prg_OBJECTS)
+sentence_1_prg_DEPENDENCIES = ../src/libgettextsrc.la \
+	$(am__DEPENDENCIES_1)
 am_testlocale_OBJECTS = testlocale.$(OBJEXT)
 testlocale_OBJECTS = $(am_testlocale_OBJECTS)
 testlocale_LDADD = $(LDADD)
@@ -574,7 +478,7 @@ SOURCES = $(cake_SOURCES) $(fc3_SOURCES) $(fc4_SOURCES) $(fc5_SOURCES) \
 	$(gettext_3_prg_SOURCES) $(gettext_4_prg_SOURCES) \
 	$(gettext_5_prg_SOURCES) $(gettext_6_prg_SOURCES) \
 	$(gettext_7_prg_SOURCES) $(gettext_8_prg_SOURCES) \
-	$(gettextpo_1_prg_SOURCES) $(sentence_SOURCES) \
+	$(gettextpo_1_prg_SOURCES) $(sentence_1_prg_SOURCES) \
 	$(testlocale_SOURCES) $(tstgettext_SOURCES) \
 	$(tstngettext_SOURCES)
 DIST_SOURCES = $(cake_SOURCES) $(fc3_SOURCES) $(fc4_SOURCES) \
@@ -582,7 +486,7 @@ DIST_SOURCES = $(cake_SOURCES) $(fc3_SOURCES) $(fc4_SOURCES) \
 	$(gettext_4_prg_SOURCES) $(gettext_5_prg_SOURCES) \
 	$(gettext_6_prg_SOURCES) $(gettext_7_prg_SOURCES) \
 	$(gettext_8_prg_SOURCES) $(gettextpo_1_prg_SOURCES) \
-	$(sentence_SOURCES) $(testlocale_SOURCES) \
+	$(sentence_1_prg_SOURCES) $(testlocale_SOURCES) \
 	$(tstgettext_SOURCES) $(tstngettext_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -2179,11 +2083,141 @@ EXTRA_DIST = init.sh init.cfg $(TESTS) test.mo overflow-1.mo \
 	gettext-7.po gettextpo-1.de.po xgettext-1 xgettext-c-1 \
 	xg-c-21.c common/supplemental/plurals.xml
 MOSTLYCLEANFILES = core *.stackdump
+TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \
+	gettext-8 \
+	msgattrib-1 msgattrib-2 msgattrib-3 msgattrib-4 msgattrib-5 \
+	msgattrib-6 msgattrib-7 msgattrib-8 msgattrib-9 msgattrib-10 \
+	msgattrib-11 msgattrib-12 msgattrib-13 msgattrib-14 msgattrib-15 \
+	msgattrib-16 msgattrib-17 msgattrib-18 msgattrib-19 \
+	msgattrib-properties-1 \
+	msgcat-1 msgcat-2 msgcat-3 msgcat-4 msgcat-5 msgcat-6 msgcat-7 \
+	msgcat-8 msgcat-9 msgcat-10 msgcat-11 msgcat-12 msgcat-13 msgcat-14 \
+	msgcat-15 msgcat-16 msgcat-17 msgcat-18 msgcat-19 msgcat-20 \
+	msgcat-properties-1 msgcat-properties-2 \
+	msgcat-stringtable-1 \
+	msgcmp-1 msgcmp-2 msgcmp-3 msgcmp-4 \
+	msgcomm-1 msgcomm-2 msgcomm-3 msgcomm-4 msgcomm-5 msgcomm-6 msgcomm-7 \
+	msgcomm-8 msgcomm-9 msgcomm-10 msgcomm-11 msgcomm-12 msgcomm-13 \
+	msgcomm-14 msgcomm-15 msgcomm-16 msgcomm-17 msgcomm-18 msgcomm-19 \
+	msgcomm-20 msgcomm-21 msgcomm-22 msgcomm-23 msgcomm-24 msgcomm-25 \
+	msgcomm-26 msgcomm-27 msgcomm-28 \
+	msgconv-1 msgconv-2 msgconv-3 msgconv-4 msgconv-5 msgconv-6 msgconv-7 \
+	msgen-1 msgen-2 msgen-3 msgen-4 \
+	msgexec-1 msgexec-2 msgexec-3 msgexec-4 msgexec-5 msgexec-6 \
+	msgfilter-1 msgfilter-2 msgfilter-3 msgfilter-4 msgfilter-5 \
+	msgfilter-6 msgfilter-7 msgfilter-8 \
+	msgfilter-sr-latin-1 msgfilter-quote-1 \
+	msgfmt-1 msgfmt-2 msgfmt-3 msgfmt-4 msgfmt-5 msgfmt-6 msgfmt-7 \
+	msgfmt-8 msgfmt-9 msgfmt-10 msgfmt-11 msgfmt-12 msgfmt-13 msgfmt-14 \
+	msgfmt-15 msgfmt-16 msgfmt-17 msgfmt-18 \
+	msgfmt-properties-1 \
+	msgfmt-qt-1 msgfmt-qt-2 \
+	msgfmt-desktop-1 msgfmt-desktop-2 \
+	msgfmt-xml-1 msgfmt-xml-2 \
+	msggrep-1 msggrep-2 msggrep-3 msggrep-4 msggrep-5 msggrep-6 msggrep-7 \
+	msggrep-8 msggrep-9 msggrep-10 msggrep-11 \
+	msginit-1 msginit-2 msginit-3 msginit-4 \
+	msgmerge-1 msgmerge-2 msgmerge-3 msgmerge-4 msgmerge-5 msgmerge-6 \
+	msgmerge-7 msgmerge-8 msgmerge-9 msgmerge-10 msgmerge-11 msgmerge-12 \
+	msgmerge-13 msgmerge-14 msgmerge-15 msgmerge-16 msgmerge-17 \
+	msgmerge-18 msgmerge-19 msgmerge-20 msgmerge-21 msgmerge-22 \
+	msgmerge-23 msgmerge-24 msgmerge-25 \
+	msgmerge-compendium-1 msgmerge-compendium-2 msgmerge-compendium-3 \
+	msgmerge-compendium-4 msgmerge-compendium-5 msgmerge-compendium-6 \
+	msgmerge-properties-1 msgmerge-properties-2 \
+	msgmerge-update-1 msgmerge-update-2 msgmerge-update-3 \
+	msgmerge-update-4 \
+	msgunfmt-1 msgunfmt-2 msgunfmt-3 \
+	msgunfmt-csharp-1 \
+	msgunfmt-java-1 \
+	msgunfmt-properties-1 \
+	msgunfmt-tcl-1 \
+	msguniq-1 msguniq-2 msguniq-3 msguniq-4 msguniq-5 msguniq-6 msguniq-7 \
+	recode-sr-latin-1 recode-sr-latin-2 \
+	xgettext-2 xgettext-3 xgettext-4 xgettext-5 xgettext-6 \
+	xgettext-7 xgettext-8 xgettext-9 xgettext-10 xgettext-11 xgettext-12 \
+	xgettext-13 xgettext-14 \
+	xgettext-appdata-1 \
+	xgettext-awk-1 xgettext-awk-2 \
+	xgettext-c-2 xgettext-c-3 xgettext-c-4 xgettext-c-5 \
+	xgettext-c-6 xgettext-c-7 xgettext-c-8 xgettext-c-9 xgettext-c-10 \
+	xgettext-c-11 xgettext-c-12 xgettext-c-13 xgettext-c-14 xgettext-c-15 \
+	xgettext-c-16 xgettext-c-17 xgettext-c-18 xgettext-c-19 xgettext-c-20 \
+	xgettext-c-21 \
+	xgettext-csharp-1 xgettext-csharp-2 xgettext-csharp-3 \
+	xgettext-csharp-4 xgettext-csharp-5 xgettext-csharp-6 \
+	xgettext-csharp-7 xgettext-csharp-8 \
+	xgettext-elisp-1 xgettext-elisp-2 \
+	xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 xgettext-glade-4 \
+	xgettext-glade-5 xgettext-glade-6 xgettext-glade-7 \
+	xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \
+	xgettext-java-5 xgettext-java-6 xgettext-java-7 \
+	xgettext-librep-1 xgettext-librep-2 \
+	xgettext-lisp-1 xgettext-lisp-2 \
+	xgettext-objc-1 xgettext-objc-2 \
+	xgettext-perl-1 xgettext-perl-2 xgettext-perl-3 xgettext-perl-4 \
+	xgettext-perl-5 xgettext-perl-6 xgettext-perl-7 xgettext-perl-8 \
+	xgettext-php-1 xgettext-php-2 xgettext-php-3 xgettext-php-4 \
+	xgettext-po-1 \
+	xgettext-properties-1 \
+	xgettext-python-1 xgettext-python-2 xgettext-python-3 \
+	xgettext-python-4 \
+	xgettext-scheme-1 xgettext-scheme-2 xgettext-scheme-3 \
+	xgettext-scheme-4 \
+	xgettext-sh-1 xgettext-sh-2 xgettext-sh-3 xgettext-sh-4 xgettext-sh-5 \
+	xgettext-sh-6 \
+	xgettext-smalltalk-1 xgettext-smalltalk-2 \
+	xgettext-stringtable-1 \
+	xgettext-tcl-1 xgettext-tcl-2 xgettext-tcl-3 xgettext-tcl-4 \
+	xgettext-ycp-1 xgettext-ycp-2 xgettext-ycp-3 xgettext-ycp-4 \
+	xgettext-lua-1 xgettext-lua-2 \
+	xgettext-javascript-1 xgettext-javascript-2 xgettext-javascript-3 \
+	xgettext-javascript-4 xgettext-javascript-5 xgettext-javascript-6 \
+	xgettext-vala-1 \
+	xgettext-gsettings-1 \
+	xgettext-desktop-1 \
+	xgettext-its-1 xgettext-its-2 \
+	format-awk-1 format-awk-2 \
+	format-boost-1 format-boost-2 \
+	format-c-1 format-c-2 format-c-3 format-c-4 format-c-5 \
+	format-csharp-1 format-csharp-2 \
+	format-elisp-1 format-elisp-2 \
+	format-gcc-internal-1 format-gcc-internal-2 \
+	format-gfc-internal-1 format-gfc-internal-2 \
+	format-java-1 format-java-2 \
+	format-kde-1 format-kde-2 \
+	format-kde-kuit-1 format-kde-kuit-2 \
+	format-librep-1 format-librep-2 \
+	format-lisp-1 format-lisp-2 \
+	format-php-1 format-php-2 \
+	format-python-1 format-python-2 \
+	format-python-brace-1 format-python-brace-2 \
+	format-pascal-1 format-pascal-2 \
+	format-perl-1 format-perl-2 \
+	format-perl-brace-1 format-perl-brace-2 \
+	format-perl-mixed-1 format-perl-mixed-2 \
+	format-qt-1 format-qt-2 \
+	format-qt-plural-1 format-qt-plural-2 \
+	format-scheme-1 format-scheme-2 \
+	format-sh-1 format-sh-2 \
+	format-tcl-1 format-tcl-2 \
+	format-ycp-1 format-ycp-2 \
+	format-lua-1 format-lua-2 \
+	format-javascript-1 format-javascript-2 \
+	plural-1 plural-2 \
+	gettextpo-1 sentence-1 \
+	lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
+	lang-python-2 lang-clisp lang-elisp lang-librep lang-guile \
+	lang-smalltalk lang-java lang-csharp lang-gawk lang-pascal \
+	lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php lang-po lang-rst \
+	lang-lua lang-javascript lang-vala \
+	autopoint-1 autopoint-2 autopoint-3 cldr-plurals-1
+
 
 # For debugging memory leaks and memory allocation bugs.
 # You should build with --disable-shared when using valgrind.
 CHECKER = 
-#CHECKER = valgrind --tool=memcheck --suppressions=$(srcdir)/../gnulib-lib/malloca.valgrind --suppressions=$(srcdir)/../gnulib-lib/libunistring.valgrind --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes
+#CHECKER = valgrind --tool=memcheck --suppressions=$(abs_srcdir)/../gnulib-lib/malloca.valgrind --suppressions=$(abs_srcdir)/../gnulib-lib/libunistring.valgrind --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes
 #CHECKER = valgrind --tool=massif --format=html --depth=10 --alloc-fn=xmalloc --alloc-fn=xrealloc --stacks=no
 TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
 		    abs_srcdir=$(abs_srcdir) \
@@ -2265,9 +2299,9 @@ gettextpo_1_prg_CPPFLAGS = \
 # Don't add more libraries here. This test must check whether libgettextpo is
 # self contained.
 gettextpo_1_prg_LDADD = ../libgettextpo/libgettextpo.la $(LDADD)
-sentence_SOURCES = sentence.c
-sentence_CPPFLAGS = $(AM_CPPFLAGS) -I../src -I$(top_srcdir)/src
-sentence_LDADD = ../src/libgettextsrc.la $(LDADD)
+sentence_1_prg_SOURCES = sentence-1-prg.c
+sentence_1_prg_CPPFLAGS = $(AM_CPPFLAGS) -I../src -I$(top_srcdir)/src
+sentence_1_prg_LDADD = ../src/libgettextsrc.la $(LDADD)
 all: all-am
 
 .SUFFIXES:
@@ -2357,9 +2391,9 @@ gettextpo-1-prg$(EXEEXT): $(gettextpo_1_prg_OBJECTS) $(gettextpo_1_prg_DEPENDENC
 	@rm -f gettextpo-1-prg$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gettextpo_1_prg_OBJECTS) $(gettextpo_1_prg_LDADD) $(LIBS)
 
-sentence$(EXEEXT): $(sentence_OBJECTS) $(sentence_DEPENDENCIES) $(EXTRA_sentence_DEPENDENCIES) 
-	@rm -f sentence$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(sentence_OBJECTS) $(sentence_LDADD) $(LIBS)
+sentence-1-prg$(EXEEXT): $(sentence_1_prg_OBJECTS) $(sentence_1_prg_DEPENDENCIES) $(EXTRA_sentence_1_prg_DEPENDENCIES) 
+	@rm -f sentence-1-prg$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(sentence_1_prg_OBJECTS) $(sentence_1_prg_LDADD) $(LIBS)
 
 testlocale$(EXEEXT): $(testlocale_OBJECTS) $(testlocale_DEPENDENCIES) $(EXTRA_testlocale_DEPENDENCIES) 
 	@rm -f testlocale$(EXEEXT)
@@ -2406,11 +2440,11 @@ gettextpo_1_prg-gettextpo-1-prg.o: gettextpo-1-prg.c
 gettextpo_1_prg-gettextpo-1-prg.obj: gettextpo-1-prg.c
 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gettextpo_1_prg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gettextpo_1_prg-gettextpo-1-prg.obj `if test -f 'gettextpo-1-prg.c'; then $(CYGPATH_W) 'gettextpo-1-prg.c'; else $(CYGPATH_W) '$(srcdir)/gettextpo-1-prg.c'; fi`
 
-sentence-sentence.o: sentence.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sentence_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sentence-sentence.o `test -f 'sentence.c' || echo '$(srcdir)/'`sentence.c
+sentence_1_prg-sentence-1-prg.o: sentence-1-prg.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sentence_1_prg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sentence_1_prg-sentence-1-prg.o `test -f 'sentence-1-prg.c' || echo '$(srcdir)/'`sentence-1-prg.c
 
-sentence-sentence.obj: sentence.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sentence_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sentence-sentence.obj `if test -f 'sentence.c'; then $(CYGPATH_W) 'sentence.c'; else $(CYGPATH_W) '$(srcdir)/sentence.c'; fi`
+sentence_1_prg-sentence-1-prg.obj: sentence-1-prg.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sentence_1_prg_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sentence_1_prg-sentence-1-prg.obj `if test -f 'sentence-1-prg.c'; then $(CYGPATH_W) 'sentence-1-prg.c'; else $(CYGPATH_W) '$(srcdir)/sentence-1-prg.c'; fi`
 
 tstgettext-tstgettext.o: tstgettext.c
 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tstgettext_CFLAGS) $(CFLAGS) -c -o tstgettext-tstgettext.o `test -f 'tstgettext.c' || echo '$(srcdir)/'`tstgettext.c
@@ -4875,6 +4909,13 @@ xgettext-its-1.log: xgettext-its-1
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+xgettext-its-2.log: xgettext-its-2
+	@p='xgettext-its-2'; \
+	b='xgettext-its-2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 format-awk-1.log: format-awk-1
 	@p='format-awk-1'; \
 	b='format-awk-1'; \
@@ -5295,9 +5336,9 @@ gettextpo-1.log: gettextpo-1
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-sentence.log: sentence$(EXEEXT)
-	@p='sentence$(EXEEXT)'; \
-	b='sentence'; \
+sentence-1.log: sentence-1
+	@p='sentence-1'; \
+	b='sentence-1'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
diff --git a/gettext-tools/tests/autopoint-1 b/gettext-tools/tests/autopoint-1
index 1a6be8f..499c1f7 100755
--- a/gettext-tools/tests/autopoint-1
+++ b/gettext-tools/tests/autopoint-1
@@ -5,14 +5,14 @@
 
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf not found"; exit 77; }
+  || { echo "Skipping test: autoconf not found"; Exit 77; }
 
 cat <<\EOF >configure.ac
 AC_PREREQ([2.60])
 EOF
 
 ${AUTOCONF} >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf version too old"; exit 77; }
+  || { echo "Skipping test: autoconf version too old"; Exit 77; }
 
 rm -f configure.ac
 
@@ -23,11 +23,11 @@ export gettext_datadir
 
 # no configure.ac
 $gettext_datadir/autopoint 2>&1 | grep 'Missing configure.in or configure.ac' 2>&1 >/dev/null \
-    || exit 1
+    || Exit 1
 
-test ! -d intl || exit 1
-test ! -d m4 || exit 1
-test ! -d po || exit 1
+test ! -d intl || Exit 1
+test ! -d m4 || Exit 1
+test ! -d po || Exit 1
 
 # configure.ac without AM_GNU_GETTEXT_VERSION
 cat <<\EOF >configure.ac
@@ -41,11 +41,11 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint 2>&1 | grep 'Missing version' 2>&1 >/dev/null \
-    || exit 1
+    || Exit 1
 
-test ! -d intl || exit 1
-test ! -d m4 || exit 1
-test ! -d po || exit 1
+test ! -d intl || Exit 1
+test ! -d m4 || Exit 1
+test ! -d po || Exit 1
 
 # VERSION specified through intl/VERSION file, but in wrong format
 cat <<\EOF >configure.ac
@@ -62,10 +62,10 @@ test -d intl || mkdir intl
 echo bogus-version > intl/VERSION
 
 $gettext_datadir/autopoint 2>&1 | grep 'Missing version' 2>&1 >/dev/null \
-    || exit 1
+    || Exit 1
 
-test ! -d m4 || exit 1
-test ! -d po || exit 1
+test ! -d m4 || Exit 1
+test ! -d po || Exit 1
 
 # VERSION specified through intl/VERSION file
 cat <<\EOF >configure.ac
@@ -84,15 +84,15 @@ echo gettext-0.15 > intl/VERSION
 
 # For further investigation, autopoint keeps autopoint.diff in $TMPDIR
 # if there is a mismatch.  Set TMPDIR not to pollute /tmp.
-TMPDIR="$PWD" $gettext_datadir/autopoint 2>&1 | grep 'locally modified' 2>&1 >/dev/null || exit 1
+TMPDIR="$PWD" $gettext_datadir/autopoint 2>&1 | grep 'locally modified' 2>&1 >/dev/null || Exit 1
 
-test ! -d m4 || exit 1
-test ! -d po || exit 1
+test ! -d m4 || Exit 1
+test ! -d po || Exit 1
 
 echo 'GNU gettext library from gettext-0.15' > intl/VERSION
 
-TMPDIR="$PWD" $gettext_datadir/autopoint 2>&1 || exit 1
+TMPDIR="$PWD" $gettext_datadir/autopoint 2>&1 || Exit 1
 
 rm -fr intl
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/autopoint-2 b/gettext-tools/tests/autopoint-2
index 740937a..e86a7f3 100755
--- a/gettext-tools/tests/autopoint-2
+++ b/gettext-tools/tests/autopoint-2
@@ -5,14 +5,14 @@
 
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf not found"; exit 77; }
+  || { echo "Skipping test: autoconf not found"; Exit 77; }
 
 cat <<\EOF >configure.ac
 AC_PREREQ([2.60])
 EOF
 
 ${AUTOCONF} >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf version too old"; exit 77; }
+  || { echo "Skipping test: autoconf version too old"; Exit 77; }
 
 rm -f configure.ac
 
@@ -35,16 +35,16 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
-test -d build-aux || exit 1
+test ! -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
+test -d build-aux || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
-test -f build-aux/config.rpath || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
+test -f build-aux/config.rpath || Exit 1
 
 rm -fr m4 po
 
@@ -63,15 +63,15 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f intl/VERSION || exit 1
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f intl/VERSION || Exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 rm -fr intl m4 po
 
@@ -96,15 +96,15 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test ! -d m4 || exit 1
-test -d gettext-m4 || exit 1
-test -d po || exit 1
+test ! -d intl || Exit 1
+test ! -d m4 || Exit 1
+test -d gettext-m4 || Exit 1
+test -d po || Exit 1
 
-test -f gettext-m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f gettext-m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 rm -fr gettext-m4 po
 
@@ -124,14 +124,14 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test ! -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 rm -fr m4 po
 
@@ -156,14 +156,14 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test ! -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 rm -fr m4 po
 
@@ -182,14 +182,14 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test ! -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 # Check for the case where both AM_GNU_GETTEXT_REQUIRE_VERSION and
 # AM_GNU_GETTEXT_VERSION are used.
@@ -211,18 +211,18 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >autopoint.out 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-grep 'using AM_GNU_GETTEXT_REQUIRE_VERSION' autopoint.out 2>&1 >/dev/null || exit 1
+grep 'using AM_GNU_GETTEXT_REQUIRE_VERSION' autopoint.out 2>&1 >/dev/null || Exit 1
 
-test -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
 cat >autopoint.ver <<EOF
 GNU gettext library from gettext-$ARCHIVE_VERSION
 EOF
 : ${DIFF=diff}
-${DIFF} autopoint.ver intl/VERSION || exit 1
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+${DIFF} autopoint.ver intl/VERSION || Exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3
index c0f468c..722910b 100755
--- a/gettext-tools/tests/autopoint-3
+++ b/gettext-tools/tests/autopoint-3
@@ -5,20 +5,20 @@
 
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf not found"; exit 77; }
+  || { echo "Skipping test: autoconf not found"; Exit 77; }
 
 cat <<\EOF >configure.ac
 AC_PREREQ([2.60])
 EOF
 
 ${AUTOCONF} >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf version too old"; exit 77; }
+  || { echo "Skipping test: autoconf version too old"; Exit 77; }
 
 rm -f configure.ac
 
 : ${AUTOMAKE=automake}
 ${AUTOMAKE} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: automake not found"; exit 77; }
+  || { echo "Skipping test: automake not found"; Exit 77; }
 
 cat <<\EOF >configure.ac
 AC_PREREQ([2.60])
@@ -30,22 +30,22 @@ EOF
 
 : ${ACLOCAL=aclocal}
 ${ACLOCAL} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 : > Makefile.am
 
 ${AUTOMAKE} --add-missing >/dev/null 2>/dev/null \
-  || { echo "Skipping test: automake version too old"; exit 77; }
+  || { echo "Skipping test: automake version too old"; Exit 77; }
 
 rm -f configure.ac Makefile.am
 
 : ${LIBTOOLIZE=libtoolize}
 ${LIBTOOLIZE} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: libtoolize not found"; exit 77; }
+  || { echo "Skipping test: libtoolize not found"; Exit 77; }
 
 : ${MAKE=make}
 ${MAKE} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: make not found"; exit 77; }
+  || { echo "Skipping test: make not found"; Exit 77; }
 
 gettext_datadir=$top_builddir/misc
 export gettext_datadir
@@ -97,43 +97,43 @@ cp -p "$abs_top_srcdir"/gnulib-lib/gettext.h .
 cp -p "$abs_top_srcdir"/examples/hello-c/hello.c .
 
 $gettext_datadir/autopoint -f >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 cp -p po/Makevars.template po/Makevars
 echo hello.c > po/POTFILES.in
 
 ${LIBTOOLIZE} -f -i >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${ACLOCAL} -I m4 >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 : ${AUTOHEADER=autoheader}
 ${AUTOHEADER} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${AUTOCONF} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${AUTOMAKE} -a -c >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 # Check if libintl compiles.
 : ${CONFIG_SHELL=${SHELL-/bin/sh}}
 ${CONFIG_SHELL} ./configure --with-included-gettext >/dev/null 2>autpoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${MAKE} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${MAKE} dist >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/cldr-plurals-1 b/gettext-tools/tests/cldr-plurals-1
index e593812..18a8b61 100755
--- a/gettext-tools/tests/cldr-plurals-1
+++ b/gettext-tools/tests/cldr-plurals-1
@@ -8,7 +8,7 @@
 LC_ALL=C "$top_builddir/src/cldr-plurals" ru /dev/null 2>&1 | grep 'extraction is not supported' > /dev/null 2>&1
 test $? = 0 && {
   echo "Skipping test: cldr-plurals was built without XML support"
-  exit 77
+  Exit 77
 }
 
 cat > ar.ok <<\EOF
@@ -19,7 +19,7 @@ EOF
 zero: n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000; one: n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000; two: n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000; few: n % 100 = 3..10 @integer 3~10, 103~110, 1003, … @decimal 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 103.0, 1003.0, …; many: n % 100 = 11..99 @integer 11~26, 111, 1011, … @decimal 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 111.0, 1011.0, …; other:  @integer 100~102, 200~202, 300~302, 400~402, 500~502, 600, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …
 EOF
 
-${DIFF} ar.ok ar.out || exit 1
+${DIFF} ar.ok ar.out || Exit 1
 
 cat > ru.ok <<\EOF
 nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);
@@ -29,7 +29,7 @@ EOF
 one: v = 0 and i % 10 = 1 and i % 100 != 11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …; few: v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, …; many: v = 0 and i % 10 = 0 or v = 0 and i % 10 = 5..9 or v = 0 and i % 100 = 11..14 @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …; other:    @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …
 EOF
 
-${DIFF} ru.ok ru.out || exit 1
+${DIFF} ru.ok ru.out || Exit 1
 
 # Test extraction from CLDR
 
@@ -48,12 +48,12 @@ EOF
 cat > foo.ok <<\EOF
 nplurals=2; plural=(n != 1);
 EOF
-${DIFF} foo.ok foo.out || exit 1
+${DIFF} foo.ok foo.out || Exit 1
 
 "$top_builddir/src/cldr-plurals" -c foo foo.in > foo.cldr.out
 cat > foo.cldr.ok <<\EOF
 one: i = 1 and v = 0 @integer 1; other:  @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …
 EOF
-${DIFF} foo.cldr.ok foo.cldr.out || exit 1
+${DIFF} foo.cldr.ok foo.cldr.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-awk-1 b/gettext-tools/tests/format-awk-1
index 0baa275..ce423cb 100755
--- a/gettext-tools/tests/format-awk-1
+++ b/gettext-tools/tests/format-awk-1
@@ -106,8 +106,8 @@ while read comment; do
   cat <<EOF > f-a-1-$n.in
 dcgettext(${string});
 EOF
-  ${XGETTEXT} -L awk -o f-a-1-$n.po f-a-1-$n.in || exit 1
-  test -f f-a-1-$n.po || exit 1
+  ${XGETTEXT} -L awk -o f-a-1-$n.po f-a-1-$n.in || Exit 1
+  test -f f-a-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep awk-format f-a-1-$n.po > /dev/null; then
@@ -127,9 +127,9 @@ EOF
     cat f-a-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-a-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-a-1-$n.in f-a-1-$n.po
 done < f-a-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-awk-2 b/gettext-tools/tests/format-awk-2
index feaaf82..6a458bb 100755
--- a/gettext-tools/tests/format-awk-2
+++ b/gettext-tools/tests/format-awk-2
@@ -131,9 +131,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-a-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-a-2-$n.po f-a-2-$n.mo
 done < f-a-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-boost-1 b/gettext-tools/tests/format-boost-1
index a9d4ad9..717a796 100755
--- a/gettext-tools/tests/format-boost-1
+++ b/gettext-tools/tests/format-boost-1
@@ -280,8 +280,8 @@ while read comment; do
   cat <<EOF > f-bo-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L C++ --boost -o f-bo-1-$n.po f-bo-1-$n.in || exit 1
-  test -f f-bo-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --boost -o f-bo-1-$n.po f-bo-1-$n.in || Exit 1
+  test -f f-bo-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep boost-format f-bo-1-$n.po > /dev/null; then
@@ -301,9 +301,9 @@ EOF
     cat f-bo-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-bo-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-bo-1-$n.in f-bo-1-$n.po
 done < f-bo-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-boost-2 b/gettext-tools/tests/format-boost-2
index b41b7b0..c97a4b1 100755
--- a/gettext-tools/tests/format-boost-2
+++ b/gettext-tools/tests/format-boost-2
@@ -197,9 +197,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-bo-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-bo-2-$n.po f-bo-2-$n.mo
 done < f-bo-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-c-1 b/gettext-tools/tests/format-c-1
index 8150abf..83ba0ca 100755
--- a/gettext-tools/tests/format-c-1
+++ b/gettext-tools/tests/format-c-1
@@ -130,8 +130,8 @@ while read comment; do
   cat <<EOF > f-c-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L C -o f-c-1-$n.po f-c-1-$n.in || exit 1
-  test -f f-c-1-$n.po || exit 1
+  ${XGETTEXT} -L C -o f-c-1-$n.po f-c-1-$n.in || Exit 1
+  test -f f-c-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep c-format f-c-1-$n.po > /dev/null; then
@@ -151,9 +151,9 @@ EOF
     cat f-c-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-c-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-c-1-$n.in f-c-1-$n.po
 done < f-c-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-c-2 b/gettext-tools/tests/format-c-2
index e7793e0..4883a27 100755
--- a/gettext-tools/tests/format-c-2
+++ b/gettext-tools/tests/format-c-2
@@ -299,9 +299,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-c-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-c-2-$n.po f-c-2-$n.mo
 done < f-c-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3
index b72da21..0509e1f 100755
--- a/gettext-tools/tests/format-c-3
+++ b/gettext-tools/tests/format-c-3
@@ -4,8 +4,8 @@
 # Test ISO C 99 <inttypes.h> format string directives.
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc3.tmp --omit-header --no-location "$abs_srcdir"/format-c-3-prg.c || exit 1
-LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot || exit 1
+${XGETTEXT} -o fc3.tmp --omit-header --no-location "$abs_srcdir"/format-c-3-prg.c || Exit 1
+LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot || Exit 1
 
 cat <<EOF > fc3.ok
 #, c-format
@@ -14,7 +14,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} fc3.ok fc3.pot || exit 1
+${DIFF} fc3.ok fc3.pot || Exit 1
 
 cat <<EOF > fc3-de.po
 #, c-format
@@ -30,11 +30,11 @@ test -d fc3-dir/de/LC_MESSAGES || mkdir fc3-dir/de/LC_MESSAGES
 ${MSGFMT} -o fc3-dir/de/LC_MESSAGES/fc3.mo fc3-de.po
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o fc3-de.po.tmp fc3-dir/de/LC_MESSAGES/fc3.mo || exit 1
-LC_ALL=C tr -d '\r' < fc3-de.po.tmp > fc3-de.po.un || exit 1
+${MSGUNFMT} -o fc3-de.po.tmp fc3-dir/de/LC_MESSAGES/fc3.mo || Exit 1
+LC_ALL=C tr -d '\r' < fc3-de.po.tmp > fc3-de.po.un || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fc3-de.po fc3-de.po.un || exit 1
+${DIFF} fc3-de.po fc3-de.po.un || Exit 1
 
 LANGUAGE= ../fc3 de_DE
 result=$?
diff --git a/gettext-tools/tests/format-c-3-prg.c b/gettext-tools/tests/format-c-3-prg.c
index b1239cf..c417abd 100644
--- a/gettext-tools/tests/format-c-3-prg.c
+++ b/gettext-tools/tests/format-c-3-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the format-c-3 test.
-   Copyright (C) 2002, 2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009, 2015-2016 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
diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4
index edfdc4e..3ab9ddc 100755
--- a/gettext-tools/tests/format-c-4
+++ b/gettext-tools/tests/format-c-4
@@ -4,8 +4,8 @@
 # Test ISO C 99 <inttypes.h> format string directives with plural forms.
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc4.tmp --omit-header --no-location "$abs_srcdir"/format-c-4-prg.c || exit 1
-LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot || exit 1
+${XGETTEXT} -o fc4.tmp --omit-header --no-location "$abs_srcdir"/format-c-4-prg.c || Exit 1
+LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot || Exit 1
 
 cat <<EOF > fc4.ok
 #, c-format
@@ -16,7 +16,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} fc4.ok fc4.pot || exit 1
+${DIFF} fc4.ok fc4.pot || Exit 1
 
 cat <<EOF > fc4-de.po
 #, c-format
@@ -34,11 +34,11 @@ test -d fc4-dir/de/LC_MESSAGES || mkdir fc4-dir/de/LC_MESSAGES
 ${MSGFMT} -o fc4-dir/de/LC_MESSAGES/fc4.mo fc4-de.po
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o fc4-de.po.tmp fc4-dir/de/LC_MESSAGES/fc4.mo || exit 1
-LC_ALL=C tr -d '\r' < fc4-de.po.tmp > fc4-de.po.un || exit 1
+${MSGUNFMT} -o fc4-de.po.tmp fc4-dir/de/LC_MESSAGES/fc4.mo || Exit 1
+LC_ALL=C tr -d '\r' < fc4-de.po.tmp > fc4-de.po.un || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fc4-de.po fc4-de.po.un || exit 1
+${DIFF} fc4-de.po fc4-de.po.un || Exit 1
 
 LANGUAGE= ../fc4 de_DE
 result=$?
diff --git a/gettext-tools/tests/format-c-4-prg.c b/gettext-tools/tests/format-c-4-prg.c
index 47cfb2e..ad96441 100644
--- a/gettext-tools/tests/format-c-4-prg.c
+++ b/gettext-tools/tests/format-c-4-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the format-c-4 test.
-   Copyright (C) 2002, 2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009, 2015-2016 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
diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5
index 7868785..9192967 100755
--- a/gettext-tools/tests/format-c-5
+++ b/gettext-tools/tests/format-c-5
@@ -4,8 +4,8 @@
 # Test 'I' format directive flag.
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc5.tmp --omit-header --no-location "$abs_srcdir"/format-c-5-prg.c || exit 1
-LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot || exit 1
+${XGETTEXT} -o fc5.tmp --omit-header --no-location "$abs_srcdir"/format-c-5-prg.c || Exit 1
+LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot || Exit 1
 
 cat <<EOF > fc5.ok
 #, c-format
@@ -14,7 +14,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} fc5.ok fc5.pot || exit 1
+${DIFF} fc5.ok fc5.pot || Exit 1
 
 # This should better be Farsi, not German. Can some translator help me?
 cat <<EOF > fa.po
@@ -30,11 +30,11 @@ test -d fa/LC_MESSAGES || mkdir fa/LC_MESSAGES
 ${MSGFMT} -o fa/LC_MESSAGES/fc5.mo fa.po
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o fa.po.tmp fa/LC_MESSAGES/fc5.mo || exit 1
-LC_ALL=C tr -d '\r' < fa.po.tmp > fa.po.un || exit 1
+${MSGUNFMT} -o fa.po.tmp fa/LC_MESSAGES/fc5.mo || Exit 1
+LC_ALL=C tr -d '\r' < fa.po.tmp > fa.po.un || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fa.po fa.po.un || exit 1
+${DIFF} fa.po fa.po.un || Exit 1
 
 LANGUAGE= ../fc5 fa_IR
 case $? in
@@ -45,8 +45,8 @@ case $? in
     else
       echo "Skipping test: locale fa_IR not supported"
     fi
-    exit 77;;
-  *) exit 1;;
+    Exit 77;;
+  *) Exit 1;;
 esac
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-c-5-prg.c b/gettext-tools/tests/format-c-5-prg.c
index f3529eb..6de4e4e 100644
--- a/gettext-tools/tests/format-c-5-prg.c
+++ b/gettext-tools/tests/format-c-5-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the format-c-5 test.
-   Copyright (C) 2004, 2006, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006, 2010, 2015-2016 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
diff --git a/gettext-tools/tests/format-csharp-1 b/gettext-tools/tests/format-csharp-1
index 792165a..0bd4a23 100755
--- a/gettext-tools/tests/format-csharp-1
+++ b/gettext-tools/tests/format-csharp-1
@@ -54,8 +54,8 @@ while read comment; do
   cat <<EOF > f-cs-1-$n.in
 GetString(${string});
 EOF
-  ${XGETTEXT} -L C# -o f-cs-1-$n.po f-cs-1-$n.in || exit 1
-  test -f f-cs-1-$n.po || exit 1
+  ${XGETTEXT} -L C# -o f-cs-1-$n.po f-cs-1-$n.in || Exit 1
+  test -f f-cs-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep csharp-format f-cs-1-$n.po > /dev/null; then
@@ -75,9 +75,9 @@ EOF
     cat f-cs-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-cs-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-cs-1-$n.in f-cs-1-$n.po
 done < f-cs-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-csharp-2 b/gettext-tools/tests/format-csharp-2
index cc68575..6b63dc8 100755
--- a/gettext-tools/tests/format-csharp-2
+++ b/gettext-tools/tests/format-csharp-2
@@ -65,9 +65,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-cs-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-cs-2-$n.po f-cs-2-$n.mo
 done < f-cs-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-elisp-1 b/gettext-tools/tests/format-elisp-1
index 918530a..f95dda0 100755
--- a/gettext-tools/tests/format-elisp-1
+++ b/gettext-tools/tests/format-elisp-1
@@ -102,8 +102,8 @@ while read comment; do
   cat <<EOF > f-el-1-$n.in
 (_ ${string});
 EOF
-  ${XGETTEXT} -L EmacsLisp -o f-el-1-$n.po f-el-1-$n.in || exit 1
-  test -f f-el-1-$n.po || exit 1
+  ${XGETTEXT} -L EmacsLisp -o f-el-1-$n.po f-el-1-$n.in || Exit 1
+  test -f f-el-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep elisp-format f-el-1-$n.po > /dev/null; then
@@ -123,9 +123,9 @@ EOF
     cat f-el-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-el-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-el-1-$n.in f-el-1-$n.po
 done < f-el-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-elisp-2 b/gettext-tools/tests/format-elisp-2
index d4b1e6a..de0d118 100755
--- a/gettext-tools/tests/format-elisp-2
+++ b/gettext-tools/tests/format-elisp-2
@@ -281,9 +281,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-el-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-el-2-$n.po f-el-2-$n.mo
 done < f-el-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-gcc-internal-1 b/gettext-tools/tests/format-gcc-internal-1
index 92c931b..b0f3dd8 100755
--- a/gettext-tools/tests/format-gcc-internal-1
+++ b/gettext-tools/tests/format-gcc-internal-1
@@ -134,8 +134,8 @@ while read comment; do
   cat <<EOF > f-gi-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L GCC-source -o f-gi-1-$n.po f-gi-1-$n.in || exit 1
-  test -f f-gi-1-$n.po || exit 1
+  ${XGETTEXT} -L GCC-source -o f-gi-1-$n.po f-gi-1-$n.in || Exit 1
+  test -f f-gi-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep gcc-internal-format f-gi-1-$n.po > /dev/null; then
@@ -155,9 +155,9 @@ EOF
     cat f-gi-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-gi-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-gi-1-$n.in f-gi-1-$n.po
 done < f-gi-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-gcc-internal-2 b/gettext-tools/tests/format-gcc-internal-2
index 3034f24..c0b6045 100755
--- a/gettext-tools/tests/format-gcc-internal-2
+++ b/gettext-tools/tests/format-gcc-internal-2
@@ -530,9 +530,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-gi-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-gi-2-$n.po f-gi-2-$n.mo
 done < f-gi-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-gfc-internal-1 b/gettext-tools/tests/format-gfc-internal-1
index fc0c44c..da26e76 100755
--- a/gettext-tools/tests/format-gfc-internal-1
+++ b/gettext-tools/tests/format-gfc-internal-1
@@ -74,8 +74,8 @@ while read comment; do
   cat <<EOF > f-gf-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L GCC-source -o f-gf-1-$n.po f-gf-1-$n.in || exit 1
-  test -f f-gf-1-$n.po || exit 1
+  ${XGETTEXT} -L GCC-source -o f-gf-1-$n.po f-gf-1-$n.in || Exit 1
+  test -f f-gf-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep gfc-internal-format f-gf-1-$n.po > /dev/null; then
@@ -95,9 +95,9 @@ EOF
     cat f-gf-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-gf-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-gf-1-$n.in f-gf-1-$n.po
 done < f-gf-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-gfc-internal-2 b/gettext-tools/tests/format-gfc-internal-2
index f89fece..2c417b4 100755
--- a/gettext-tools/tests/format-gfc-internal-2
+++ b/gettext-tools/tests/format-gfc-internal-2
@@ -170,9 +170,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-gf-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-gf-2-$n.po f-gf-2-$n.mo
 done < f-gf-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-java-1 b/gettext-tools/tests/format-java-1
index ecf56dd..465e93b 100755
--- a/gettext-tools/tests/format-java-1
+++ b/gettext-tools/tests/format-java-1
@@ -124,8 +124,8 @@ while read comment; do
   cat <<EOF > f-j-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L Java -o f-j-1-$n.po f-j-1-$n.in || exit 1
-  test -f f-j-1-$n.po || exit 1
+  ${XGETTEXT} -L Java -o f-j-1-$n.po f-j-1-$n.in || Exit 1
+  test -f f-j-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep java-format f-j-1-$n.po > /dev/null; then
@@ -145,9 +145,9 @@ EOF
     cat f-j-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-j-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-j-1-$n.in f-j-1-$n.po
 done < f-j-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-java-2 b/gettext-tools/tests/format-java-2
index e363e92..dfef92e 100755
--- a/gettext-tools/tests/format-java-2
+++ b/gettext-tools/tests/format-java-2
@@ -134,9 +134,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-j-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-j-2-$n.po f-j-2-$n.mo
 done < f-j-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-javascript-1 b/gettext-tools/tests/format-javascript-1
index d53df29..c0a4aa3 100755
--- a/gettext-tools/tests/format-javascript-1
+++ b/gettext-tools/tests/format-javascript-1
@@ -42,6 +42,20 @@ cat <<\EOF > f-js-1.data
 "abc%.4.2f"
 # Valid: three arguments
 "abc%d%j%j"
+# Valid: a numbered argument
+"abc%1$d"
+# Invalid: zero
+"abc%0$d"
+# Valid: two-digit numbered arguments
+"abc%11$def%10$dgh%9$dij%8$dkl%7$dmn%6$dop%5$dqr%4$dst%3$duv%2$dwx%1$dyz"
+# Invalid: unterminated number
+"abc%1"
+# Invalid: flags before number
+"abc%+1$d"
+# Invalid: mixing of numbered and unnumbered arguments
+"abc%d%2$x"
+# Valid: multiple uses of same argument
+"abc%2$xdef%1$sghi%2$x"
 EOF
 
 : ${XGETTEXT=xgettext}
@@ -54,8 +68,8 @@ gettext(${string});
 EOF
   # Hide xgettext's "The translator cannot reorder the arguments." warnings.
   ${XGETTEXT} -L JavaScript -o f-js-1-$n.po f-js-1-$n.in 2> f-js-1.err \
-    || { cat f-js-1.err 1>&2; exit 1; }
-  test -f f-js-1-$n.po || exit 1
+    || { cat f-js-1.err 1>&2; Exit 1; }
+  test -f f-js-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep javascript-format f-js-1-$n.po > /dev/null; then
@@ -75,9 +89,9 @@ EOF
     cat f-js-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-js-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-js-1-$n.in f-js-1-$n.po
 done < f-js-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-javascript-2 b/gettext-tools/tests/format-javascript-2
index d1801b1..62113ca 100755
--- a/gettext-tools/tests/format-javascript-2
+++ b/gettext-tools/tests/format-javascript-2
@@ -14,11 +14,11 @@ msgstr "xyz%"
 msgid  "abc%2sdef"
 msgstr "xyz%3s"
 # Invalid: too few arguments
-msgid  "abc%sdef%u"
+msgid  "abc%sdef%d"
 msgstr "xyz%s"
 # Invalid: too many arguments
-msgid  "abc%udef"
-msgstr "xyz%uvw%c"
+msgid  "abc%ddef"
+msgstr "xyz%dvw%c"
 # Valid: type compatibility
 msgid  "abc%o"
 msgstr "xyz%d"
@@ -52,7 +52,7 @@ while read comment; do
   read msgstr_line
   n=`expr $n + 1`
   cat <<EOF > f-js-2-$n.po
-#, python-format
+#, javascript-format
 ${msgid_line}
 ${msgstr_line}
 EOF
@@ -74,9 +74,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-js-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-js-2-$n.po f-js-2-$n.mo
 done < f-js-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-kde-1 b/gettext-tools/tests/format-kde-1
index 1b4dafc..640fbca 100755
--- a/gettext-tools/tests/format-kde-1
+++ b/gettext-tools/tests/format-kde-1
@@ -48,8 +48,8 @@ while read comment; do
   cat <<EOF > f-kd-1-$n.in
 _(${string});
 EOF
-  ${XGETTEXT} -L C++ --kde -k_ -o f-kd-1-$n.po f-kd-1-$n.in || exit 1
-  test -f f-kd-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --kde -k_ -o f-kd-1-$n.po f-kd-1-$n.in || Exit 1
+  test -f f-kd-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep kde-format f-kd-1-$n.po > /dev/null; then
@@ -69,9 +69,9 @@ EOF
     cat f-kd-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-kd-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-kd-1-$n.in f-kd-1-$n.po
 done < f-kd-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-kde-2 b/gettext-tools/tests/format-kde-2
index 9fb96f5..8f9ddab 100755
--- a/gettext-tools/tests/format-kde-2
+++ b/gettext-tools/tests/format-kde-2
@@ -95,9 +95,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-kd-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-kd-2-$n.po f-kd-2-$n.mo
 done < f-kd-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-kde-kuit-1 b/gettext-tools/tests/format-kde-kuit-1
index aeaa743..23edc9c 100755
--- a/gettext-tools/tests/format-kde-kuit-1
+++ b/gettext-tools/tests/format-kde-kuit-1
@@ -12,7 +12,7 @@ EOF
 LC_ALL=C ${XGETTEXT} -L C++ --kde --flag=xi18n:1:kde-kuit-format -o - f-kd-invalid.cpp 2>&1 | grep 'not a valid KDE KUIT format' > /dev/null 2>&1
 test $? = 0 || {
   echo "Skipping test: xgettext was built without KDE KUIT format support"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > f-kd-1.data
@@ -43,8 +43,8 @@ while read comment; do
   cat <<EOF > f-kd-1-$n.in
 xi18n(${string});
 EOF
-  ${XGETTEXT} -L C++ --kde --flag=xi18n:1:kde-kuit-format --flag=i18n:1:kde-format -kxi18n -ki18n -o f-kd-1-$n.po f-kd-1-$n.in || exit 1
-  test -f f-kd-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --kde --flag=xi18n:1:kde-kuit-format --flag=i18n:1:kde-format -kxi18n -ki18n -o f-kd-1-$n.po f-kd-1-$n.in || Exit 1
+  test -f f-kd-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep kde-kuit-format f-kd-1-$n.po > /dev/null; then
@@ -64,9 +64,9 @@ EOF
     cat f-kd-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-kd-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-kd-1-$n.in f-kd-1-$n.po
 done < f-kd-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-kde-kuit-2 b/gettext-tools/tests/format-kde-kuit-2
index 0634b62..f4e5564 100755
--- a/gettext-tools/tests/format-kde-kuit-2
+++ b/gettext-tools/tests/format-kde-kuit-2
@@ -14,7 +14,7 @@ EOF
 LC_ALL=C ${MSGFMT} --check-format -o /dev/null f-kd-invalid.po 2>&1 | grep 'not a valid KDE KUIT format' > /dev/null 2>&1
 test $? = 0 || {
   echo "Skipping test: msgfmt was built without KDE KUIT format support"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > f-kd-2.data
@@ -72,9 +72,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-kd-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-kd-2-$n.po f-kd-2-$n.mo
 done < f-kd-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-librep-1 b/gettext-tools/tests/format-librep-1
index 2168381..cffaa89 100755
--- a/gettext-tools/tests/format-librep-1
+++ b/gettext-tools/tests/format-librep-1
@@ -76,8 +76,8 @@ while read comment; do
   cat <<EOF > f-lr-1-$n.in
 (_ ${string});
 EOF
-  ${XGETTEXT} -L librep -o f-lr-1-$n.po f-lr-1-$n.in || exit 1
-  test -f f-lr-1-$n.po || exit 1
+  ${XGETTEXT} -L librep -o f-lr-1-$n.po f-lr-1-$n.in || Exit 1
+  test -f f-lr-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep librep-format f-lr-1-$n.po > /dev/null; then
@@ -97,9 +97,9 @@ EOF
     cat f-lr-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-lr-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-lr-1-$n.in f-lr-1-$n.po
 done < f-lr-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-librep-2 b/gettext-tools/tests/format-librep-2
index 6266619..bb3c44e 100755
--- a/gettext-tools/tests/format-librep-2
+++ b/gettext-tools/tests/format-librep-2
@@ -137,9 +137,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-lr-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-lr-2-$n.po f-lr-2-$n.mo
 done < f-lr-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-lisp-1 b/gettext-tools/tests/format-lisp-1
index ef863b3..2781376 100755
--- a/gettext-tools/tests/format-lisp-1
+++ b/gettext-tools/tests/format-lisp-1
@@ -258,8 +258,8 @@ while read comment; do
   cat <<EOF > f-l-1-$n.in
 (gettext ${string})
 EOF
-  ${XGETTEXT} -L Lisp -o f-l-1-$n.po f-l-1-$n.in || exit 1
-  test -f f-l-1-$n.po || exit 1
+  ${XGETTEXT} -L Lisp -o f-l-1-$n.po f-l-1-$n.in || Exit 1
+  test -f f-l-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep lisp-format f-l-1-$n.po > /dev/null; then
@@ -279,9 +279,9 @@ EOF
     cat f-l-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-l-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-l-1-$n.in f-l-1-$n.po
 done < f-l-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-lisp-2 b/gettext-tools/tests/format-lisp-2
index 46c4fee..a3958e9 100755
--- a/gettext-tools/tests/format-lisp-2
+++ b/gettext-tools/tests/format-lisp-2
@@ -215,9 +215,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-l-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-l-2-$n.po f-l-2-$n.mo
 done < f-l-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-lua-1 b/gettext-tools/tests/format-lua-1
index 6a213d7..502342c 100755
--- a/gettext-tools/tests/format-lua-1
+++ b/gettext-tools/tests/format-lua-1
@@ -61,8 +61,8 @@ while read comment; do
   read string
   n=`expr $n + 1`
   echo "gettext.gettext(${string});" > f-lu-1-$n.in
-  ${XGETTEXT} -L Lua -o f-lu-1-$n.po f-lu-1-$n.in || exit 1
-  test -f f-lu-1-$n.po || exit 1
+  ${XGETTEXT} -L Lua -o f-lu-1-$n.po f-lu-1-$n.in || Exit 1
+  test -f f-lu-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep lua-format f-lu-1-$n.po > /dev/null; then
@@ -82,10 +82,10 @@ while read comment; do
     cat f-lu-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-lu-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-lu-1-$n.in f-lu-1-$n.po
 done < f-lu-1.data
 
-exit 0
+Exit 0
 
diff --git a/gettext-tools/tests/format-lua-2 b/gettext-tools/tests/format-lua-2
index 5c4a45b..8b7308e 100755
--- a/gettext-tools/tests/format-lua-2
+++ b/gettext-tools/tests/format-lua-2
@@ -110,9 +110,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-lu-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-lu-2-$n.po f-lu-2-$n.mo
 done < f-lu-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-pascal-1 b/gettext-tools/tests/format-pascal-1
index 16549b1..c0694c0 100755
--- a/gettext-tools/tests/format-pascal-1
+++ b/gettext-tools/tests/format-pascal-1
@@ -94,8 +94,8 @@ while read comment; do
   read string
   n=`expr $n + 1`
   echo "x.y=${string}" | sed -e "s/\"/'/g" > f-op-1-$n.in
-  ${XGETTEXT} -L RST -o f-op-1-$n.po f-op-1-$n.in || exit 1
-  test -f f-op-1-$n.po || exit 1
+  ${XGETTEXT} -L RST -o f-op-1-$n.po f-op-1-$n.in || Exit 1
+  test -f f-op-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep object-pascal-format f-op-1-$n.po > /dev/null; then
@@ -115,9 +115,9 @@ while read comment; do
     cat f-op-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-op-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-op-1-$n.in f-op-1-$n.po
 done < f-op-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-pascal-2 b/gettext-tools/tests/format-pascal-2
index 48bacc4..67d02f5 100755
--- a/gettext-tools/tests/format-pascal-2
+++ b/gettext-tools/tests/format-pascal-2
@@ -122,9 +122,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-op-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-op-2-$n.po f-op-2-$n.mo
 done < f-op-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-1 b/gettext-tools/tests/format-perl-1
index 3f8a44a..090795a 100755
--- a/gettext-tools/tests/format-perl-1
+++ b/gettext-tools/tests/format-perl-1
@@ -136,8 +136,8 @@ while read comment; do
   sed -e 's,\$,\\$,g' <<EOF > f-pl-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L Perl -o f-pl-1-$n.po f-pl-1-$n.in || exit 1
-  test -f f-pl-1-$n.po || exit 1
+  ${XGETTEXT} -L Perl -o f-pl-1-$n.po f-pl-1-$n.in || Exit 1
+  test -f f-pl-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep perl-format f-pl-1-$n.po > /dev/null; then
@@ -157,9 +157,9 @@ EOF
     cat f-pl-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-pl-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pl-1-$n.in f-pl-1-$n.po
 done < f-pl-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-2 b/gettext-tools/tests/format-perl-2
index 8bbbd2e..4a5faa4 100755
--- a/gettext-tools/tests/format-perl-2
+++ b/gettext-tools/tests/format-perl-2
@@ -233,9 +233,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-pl-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pl-2-$n.po f-pl-2-$n.mo
 done < f-pl-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-brace-1 b/gettext-tools/tests/format-perl-brace-1
index c42ddaa..413b814 100755
--- a/gettext-tools/tests/format-perl-brace-1
+++ b/gettext-tools/tests/format-perl-brace-1
@@ -36,8 +36,8 @@ while read comment; do
   cat <<EOF > f-pb-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L Perl -o f-pb-1-$n.po f-pb-1-$n.in || exit 1
-  test -f f-pb-1-$n.po || exit 1
+  ${XGETTEXT} -L Perl -o f-pb-1-$n.po f-pb-1-$n.in || Exit 1
+  test -f f-pb-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep perl-brace-format f-pb-1-$n.po > /dev/null; then
@@ -57,9 +57,9 @@ EOF
     cat f-pb-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-pb-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pb-1-$n.in f-pb-1-$n.po
 done < f-pb-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-brace-2 b/gettext-tools/tests/format-perl-brace-2
index 486bf30..a1c207d 100755
--- a/gettext-tools/tests/format-perl-brace-2
+++ b/gettext-tools/tests/format-perl-brace-2
@@ -56,9 +56,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-pb-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pb-2-$n.po f-pb-2-$n.mo
 done < f-pb-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-mixed-1 b/gettext-tools/tests/format-perl-mixed-1
index d94abf3..119fcfd 100755
--- a/gettext-tools/tests/format-perl-mixed-1
+++ b/gettext-tools/tests/format-perl-mixed-1
@@ -35,8 +35,8 @@ while read comment; do
   cat <<EOF > f-pm-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L perl --omit-header --no-location -o f-pm-1-$n.po f-pm-1-$n.in || exit 1
-  test -f f-pm-1-$n.po || exit 1
+  ${XGETTEXT} -L perl --omit-header --no-location -o f-pm-1-$n.po f-pm-1-$n.in || Exit 1
+  test -f f-pm-1-$n.po || Exit 1
   fail=
   if test -n "${formats}"; then
     # Verify that the first line contains the expected #, comment.
@@ -58,8 +58,8 @@ EOF
     cat f-pm-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-pm-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
 done < f-pm-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-mixed-2 b/gettext-tools/tests/format-perl-mixed-2
index 6e313f7..738eb1e 100755
--- a/gettext-tools/tests/format-perl-mixed-2
+++ b/gettext-tools/tests/format-perl-mixed-2
@@ -65,8 +65,8 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-pm-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
 done < f-pm-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-php-1 b/gettext-tools/tests/format-php-1
index 642e660..79583d2 100755
--- a/gettext-tools/tests/format-php-1
+++ b/gettext-tools/tests/format-php-1
@@ -82,8 +82,8 @@ while read comment; do
   read string
   n=`expr $n + 1`
   echo "<?= gettext(${string}) ?>" | sed -e 's/\$/\\\$/g' > f-ph-1-$n.in
-  ${XGETTEXT} -L PHP -o f-ph-1-$n.po f-ph-1-$n.in || exit 1
-  test -f f-ph-1-$n.po || exit 1
+  ${XGETTEXT} -L PHP -o f-ph-1-$n.po f-ph-1-$n.in || Exit 1
+  test -f f-ph-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep php-format f-ph-1-$n.po > /dev/null; then
@@ -103,9 +103,9 @@ while read comment; do
     cat f-ph-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-ph-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-ph-1-$n.in f-ph-1-$n.po
 done < f-ph-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-php-2 b/gettext-tools/tests/format-php-2
index f64c119..dc6fbc2 100755
--- a/gettext-tools/tests/format-php-2
+++ b/gettext-tools/tests/format-php-2
@@ -110,9 +110,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-ph-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-ph-2-$n.po f-ph-2-$n.mo
 done < f-ph-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-python-1 b/gettext-tools/tests/format-python-1
index b42ccca..1bbc982 100755
--- a/gettext-tools/tests/format-python-1
+++ b/gettext-tools/tests/format-python-1
@@ -104,8 +104,8 @@ gettext(${string});
 EOF
   # Hide xgettext's "The translator cannot reorder the arguments." warnings.
   ${XGETTEXT} -L Python -o f-p-1-$n.po f-p-1-$n.in 2> f-p-1.err \
-    || { cat f-p-1.err 1>&2; exit 1; }
-  test -f f-p-1-$n.po || exit 1
+    || { cat f-p-1.err 1>&2; Exit 1; }
+  test -f f-p-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep python-format f-p-1-$n.po > /dev/null; then
@@ -125,9 +125,9 @@ EOF
     cat f-p-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-p-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-p-1-$n.in f-p-1-$n.po
 done < f-p-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-python-2 b/gettext-tools/tests/format-python-2
index 204fc0c..455aba1 100755
--- a/gettext-tools/tests/format-python-2
+++ b/gettext-tools/tests/format-python-2
@@ -137,9 +137,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-p-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-p-2-$n.po f-p-2-$n.mo
 done < f-p-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-python-brace-1 b/gettext-tools/tests/format-python-brace-1
index 601b023..593e3a6 100755
--- a/gettext-tools/tests/format-python-brace-1
+++ b/gettext-tools/tests/format-python-brace-1
@@ -30,6 +30,8 @@ cat <<\EOF > f-pyb-1.data
 "abc{value[0}"
 # Invalid: unknown character in getitem operator
 "abc{value[!]}"
+# Valid: use of both getattr and getitem operators
+"abc{value.v[name]}"
 # Valid: format specifier
 "abc{value:0}"
 # Valid: standard format specifier
@@ -52,8 +54,8 @@ while read comment; do
   cat <<EOF > f-pyb-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L Python -o f-pyb-1-$n.po f-pyb-1-$n.in || exit 1
-  test -f f-pyb-1-$n.po || exit 1
+  ${XGETTEXT} -L Python -o f-pyb-1-$n.po f-pyb-1-$n.in || Exit 1
+  test -f f-pyb-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep python-brace-format f-pyb-1-$n.po > /dev/null; then
@@ -73,9 +75,9 @@ EOF
     cat f-pyb-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-pyb-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pyb-1-$n.in f-pyb-1-$n.po
 done < f-pyb-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-python-brace-2 b/gettext-tools/tests/format-python-brace-2
index 3f9423f..376ad26 100755
--- a/gettext-tools/tests/format-python-brace-2
+++ b/gettext-tools/tests/format-python-brace-2
@@ -59,9 +59,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-pyb-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pyb-2-$n.po f-pyb-2-$n.mo
 done < f-pyb-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-qt-1 b/gettext-tools/tests/format-qt-1
index a092ef7..74e27ef 100755
--- a/gettext-tools/tests/format-qt-1
+++ b/gettext-tools/tests/format-qt-1
@@ -42,8 +42,8 @@ while read comment; do
   cat <<EOF > f-qt-1-$n.in
 _(${string});
 EOF
-  ${XGETTEXT} -L C++ --qt -k_ -o f-qt-1-$n.po f-qt-1-$n.in || exit 1
-  test -f f-qt-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --qt -k_ -o f-qt-1-$n.po f-qt-1-$n.in || Exit 1
+  test -f f-qt-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep qt-format f-qt-1-$n.po > /dev/null; then
@@ -63,9 +63,9 @@ EOF
     cat f-qt-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-qt-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-qt-1-$n.in f-qt-1-$n.po
 done < f-qt-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-qt-2 b/gettext-tools/tests/format-qt-2
index 4cfc713..602c377 100755
--- a/gettext-tools/tests/format-qt-2
+++ b/gettext-tools/tests/format-qt-2
@@ -74,9 +74,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-qt-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-qt-2-$n.po f-qt-2-$n.mo
 done < f-qt-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-qt-plural-1 b/gettext-tools/tests/format-qt-plural-1
index 89bbfc3..7b44251 100755
--- a/gettext-tools/tests/format-qt-plural-1
+++ b/gettext-tools/tests/format-qt-plural-1
@@ -30,8 +30,8 @@ while read comment; do
   cat <<EOF > f-qtp-1-$n.in
 _(${string});
 EOF
-  ${XGETTEXT} -L C++ --qt -k_ -o f-qtp-1-$n.po f-qtp-1-$n.in || exit 1
-  test -f f-qtp-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --qt -k_ -o f-qtp-1-$n.po f-qtp-1-$n.in || Exit 1
+  test -f f-qtp-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep qt-plural-format f-qtp-1-$n.po > /dev/null; then
@@ -51,9 +51,9 @@ EOF
     cat f-qtp-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-qtp-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-qtp-1-$n.in f-qtp-1-$n.po
 done < f-qtp-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-qt-plural-2 b/gettext-tools/tests/format-qt-plural-2
index ec21a86..8cb6e6a 100755
--- a/gettext-tools/tests/format-qt-plural-2
+++ b/gettext-tools/tests/format-qt-plural-2
@@ -59,9 +59,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-qtp-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-qtp-2-$n.po f-qtp-2-$n.mo
 done < f-qtp-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-scheme-1 b/gettext-tools/tests/format-scheme-1
index 6a34146..8450d02 100755
--- a/gettext-tools/tests/format-scheme-1
+++ b/gettext-tools/tests/format-scheme-1
@@ -260,8 +260,8 @@ while read comment; do
   cat <<EOF > f-sc-1-$n.in
 (gettext ${string})
 EOF
-  ${XGETTEXT} -L Scheme -o f-sc-1-$n.po f-sc-1-$n.in || exit 1
-  test -f f-sc-1-$n.po || exit 1
+  ${XGETTEXT} -L Scheme -o f-sc-1-$n.po f-sc-1-$n.in || Exit 1
+  test -f f-sc-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep scheme-format f-sc-1-$n.po > /dev/null; then
@@ -281,9 +281,9 @@ EOF
     cat f-sc-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-sc-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-sc-1-$n.in f-sc-1-$n.po
 done < f-sc-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-scheme-2 b/gettext-tools/tests/format-scheme-2
index 44829ae..417a382 100755
--- a/gettext-tools/tests/format-scheme-2
+++ b/gettext-tools/tests/format-scheme-2
@@ -230,9 +230,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-sc-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-sc-2-$n.po f-sc-2-$n.mo
 done < f-sc-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-sh-1 b/gettext-tools/tests/format-sh-1
index e274a7b..28c7623 100755
--- a/gettext-tools/tests/format-sh-1
+++ b/gettext-tools/tests/format-sh-1
@@ -40,8 +40,8 @@ while read comment; do
   LC_ALL=C sed -e 's,\$,\\$,g' <<EOF > f-sh-1-$n.in
 gettext ${string};
 EOF
-  ${XGETTEXT} -L Shell --from-code=ISO-8859-1 -o f-sh-1-$n.po f-sh-1-$n.in || exit 1
-  test -f f-sh-1-$n.po || exit 1
+  ${XGETTEXT} -L Shell --from-code=ISO-8859-1 -o f-sh-1-$n.po f-sh-1-$n.in || Exit 1
+  test -f f-sh-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep sh-format f-sh-1-$n.po > /dev/null; then
@@ -61,9 +61,9 @@ EOF
     cat f-sh-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-sh-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-sh-1-$n.in f-sh-1-$n.po
 done < f-sh-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-sh-2 b/gettext-tools/tests/format-sh-2
index d98005a..5a19214 100755
--- a/gettext-tools/tests/format-sh-2
+++ b/gettext-tools/tests/format-sh-2
@@ -53,9 +53,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-sh-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-sh-2-$n.po f-sh-2-$n.mo
 done < f-sh-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-tcl-1 b/gettext-tools/tests/format-tcl-1
index feecaaa..984f0c7 100755
--- a/gettext-tools/tests/format-tcl-1
+++ b/gettext-tools/tests/format-tcl-1
@@ -108,8 +108,8 @@ while read comment; do
   cat <<EOF > f-t-1-$n.in
 [msgcat::mc ${string}];
 EOF
-  ${XGETTEXT} -L Tcl -o f-t-1-$n.po f-t-1-$n.in || exit 1
-  test -f f-t-1-$n.po || exit 1
+  ${XGETTEXT} -L Tcl -o f-t-1-$n.po f-t-1-$n.in || Exit 1
+  test -f f-t-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep tcl-format f-t-1-$n.po > /dev/null; then
@@ -129,9 +129,9 @@ EOF
     cat f-t-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-t-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-t-1-$n.in f-t-1-$n.po
 done < f-t-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-tcl-2 b/gettext-tools/tests/format-tcl-2
index 8a94236..7a9b9f9 100755
--- a/gettext-tools/tests/format-tcl-2
+++ b/gettext-tools/tests/format-tcl-2
@@ -131,9 +131,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-t-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-t-2-$n.po f-t-2-$n.mo
 done < f-t-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-ycp-1 b/gettext-tools/tests/format-ycp-1
index c010209..bf7b3a9 100755
--- a/gettext-tools/tests/format-ycp-1
+++ b/gettext-tools/tests/format-ycp-1
@@ -30,8 +30,8 @@ while read comment; do
   cat <<EOF > f-y-1-$n.in
 _(${string});
 EOF
-  ${XGETTEXT} -L YCP -o f-y-1-$n.po f-y-1-$n.in || exit 1
-  test -f f-y-1-$n.po || exit 1
+  ${XGETTEXT} -L YCP -o f-y-1-$n.po f-y-1-$n.in || Exit 1
+  test -f f-y-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep ycp-format f-y-1-$n.po > /dev/null; then
@@ -51,9 +51,9 @@ EOF
     cat f-y-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-y-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-y-1-$n.in f-y-1-$n.po
 done < f-y-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-ycp-2 b/gettext-tools/tests/format-ycp-2
index e606744..b9bc466 100755
--- a/gettext-tools/tests/format-ycp-2
+++ b/gettext-tools/tests/format-ycp-2
@@ -59,9 +59,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-y-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-y-2-$n.po f-y-2-$n.mo
 done < f-y-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/gettext-3
index 76c28a9..0f64ee8 100755
--- a/gettext-tools/tests/gettext-3
+++ b/gettext-tools/tests/gettext-3
@@ -8,7 +8,7 @@
 : ${GLIBC2=no}
 test "$GLIBC2" = yes || {
   echo "Skipping test: not a glibc system"
-  exit 77
+  Exit 77
 }
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
@@ -18,7 +18,7 @@ LC_ALL=de_DE ../testlocale || {
   else
     echo "Skipping test: locale de_DE not supported"
   fi
-  exit 77
+  Exit 77
 }
 LC_ALL=fr_FR ../testlocale || {
   if test -f /usr/bin/localedef; then
@@ -26,7 +26,7 @@ LC_ALL=fr_FR ../testlocale || {
   else
     echo "Skipping test: locale fr_FR not supported"
   fi
-  exit 77
+  Exit 77
 }
 
 test -d gt-3 || mkdir gt-3
@@ -48,9 +48,9 @@ String1 - First string for testing.
 String2 - Another string for testing.
 EOF
 
-../gettext-3-prg > gt-3.out || exit 1
+../gettext-3-prg > gt-3.out || Exit 1
 
 : ${DIFF=diff}
-${DIFF} gt-3.ok gt-3.out || exit 1
+${DIFF} gt-3.ok gt-3.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-3-prg.c b/gettext-tools/tests/gettext-3-prg.c
index 395b401..aca8c5b 100644
--- a/gettext-tools/tests/gettext-3-prg.c
+++ b/gettext-tools/tests/gettext-3-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the gettext-3 test.
-   Copyright (C) 2000, 2005, 2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2005, 2007, 2015-2016 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
diff --git a/gettext-tools/tests/gettext-4 b/gettext-tools/tests/gettext-4
index fdfa096..ba200ca 100755
--- a/gettext-tools/tests/gettext-4
+++ b/gettext-tools/tests/gettext-4
@@ -16,7 +16,7 @@
   else
     echo "Skipping test: no traditional french locale is supported"
   fi
-  exit 77
+  Exit 77
 }
 
 test -d gt-4 || mkdir gt-4
@@ -26,6 +26,6 @@ test -d gt-4/fr/LC_MESSAGES || mkdir gt-4/fr/LC_MESSAGES
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-4.po
 
-../gettext-4-prg $LOCALE_FR || exit 1
+../gettext-4-prg $LOCALE_FR || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-4-prg.c b/gettext-tools/tests/gettext-4-prg.c
index 0dfc043..7245430 100644
--- a/gettext-tools/tests/gettext-4-prg.c
+++ b/gettext-tools/tests/gettext-4-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the gettext-4 test.
-   Copyright (C) 2001, 2005-2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2005-2006, 2015-2016 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
diff --git a/gettext-tools/tests/gettext-5 b/gettext-tools/tests/gettext-5
index a7af65e..d33ebf1 100755
--- a/gettext-tools/tests/gettext-5
+++ b/gettext-tools/tests/gettext-5
@@ -8,7 +8,7 @@
 : ${GLIBC2=no}
 test "$GLIBC2" = yes || {
   echo "Skipping test: not a glibc system"
-  exit 77
+  Exit 77
 }
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
@@ -19,7 +19,7 @@ LC_ALL=de_DE.ISO-8859-1 ../testlocale || {
   else
     echo "Skipping test: locale de_DE.ISO-8859-1 not supported"
   fi
-  exit 77
+  Exit 77
 }
 LC_ALL=de_DE.UTF-8 ../testlocale || {
   if test -f /usr/bin/localedef; then
@@ -27,7 +27,7 @@ LC_ALL=de_DE.UTF-8 ../testlocale || {
   else
     echo "Skipping test: locale de_DE.UTF-8 not supported"
   fi
-  exit 77
+  Exit 77
 }
 
 test -d gt-5 || mkdir gt-5
@@ -37,6 +37,6 @@ test -d gt-5/de_DE/LC_MESSAGES || mkdir gt-5/de_DE/LC_MESSAGES
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-5.po
 
-../gettext-5-prg || exit 1
+../gettext-5-prg || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-5-prg.c b/gettext-tools/tests/gettext-5-prg.c
index db1f9cf..e70d622 100644
--- a/gettext-tools/tests/gettext-5-prg.c
+++ b/gettext-tools/tests/gettext-5-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the gettext-5 test.
-   Copyright (C) 2005, 2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2015-2016 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
diff --git a/gettext-tools/tests/gettext-6 b/gettext-tools/tests/gettext-6
index 7bc4e01..cadfbc8 100755
--- a/gettext-tools/tests/gettext-6
+++ b/gettext-tools/tests/gettext-6
@@ -15,7 +15,7 @@
   esac
 } || {
   echo "Skipping test: not a glibc or Mac OS X system"
-  exit 77
+  Exit 77
 }
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
@@ -26,7 +26,7 @@ if test -n "$missing_locale"; then
   else
     echo "Skipping test: locale ${missing_locale} not supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 test -d gt-6 || mkdir gt-6
@@ -51,11 +51,11 @@ case $? in
   0) ;;
   77)
     echo "Skipping test: not a glibc >= 2.3 or MacOS X >= 10.5 system"
-    exit 77
+    Exit 77
     ;;
 esac
 
 : ${DIFF=diff}
-${DIFF} gt-6.ok gt-6.out || exit 1
+${DIFF} gt-6.ok gt-6.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-6-prg.c b/gettext-tools/tests/gettext-6-prg.c
index e2148c9..06303cc 100644
--- a/gettext-tools/tests/gettext-6-prg.c
+++ b/gettext-tools/tests/gettext-6-prg.c
@@ -1,6 +1,5 @@
 /* Test program, used by the gettext-6 test.
-   Copyright (C) 2005-2007, 2009-2010, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2005-2007, 2009-2010, 2015-2016 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
diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7
index a38e5f1..cf9f114 100755
--- a/gettext-tools/tests/gettext-7
+++ b/gettext-tools/tests/gettext-7
@@ -15,7 +15,7 @@
   esac
 } || {
   echo "Skipping test: not a glibc or Mac OS X system"
-  exit 77
+  Exit 77
 }
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
@@ -27,7 +27,7 @@ if test -n "$missing_locale"; then
   else
     echo "Skipping test: locale ${missing_locale} not supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 test -d gt-7 || mkdir gt-7
@@ -42,11 +42,11 @@ case $? in
   0) ;;
   77)
     echo "Skipping test: not a glibc >= 2.3 or MacOS X >= 10.5 system"
-    exit 77
+    Exit 77
     ;;
   *)
-    exit 1
+    Exit 1
     ;;
 esac
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-7-prg.c b/gettext-tools/tests/gettext-7-prg.c
index 6a6146b..5934eb1 100644
--- a/gettext-tools/tests/gettext-7-prg.c
+++ b/gettext-tools/tests/gettext-7-prg.c
@@ -1,6 +1,5 @@
 /* Test program, used by the gettext-7 test.
-   Copyright (C) 2005-2007, 2009-2010, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 2005-2007, 2009-2010, 2015-2016 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
diff --git a/gettext-tools/tests/gettext-8-prg.c b/gettext-tools/tests/gettext-8-prg.c
index 22b6b03..f88062f 100644
--- a/gettext-tools/tests/gettext-8-prg.c
+++ b/gettext-tools/tests/gettext-8-prg.c
@@ -1,5 +1,5 @@
 /* Test that gettext() does not crash by stack overflow when msgid is very long.
-   Copyright (C) 2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2015-2016 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
diff --git a/gettext-tools/tests/gettextpo-1 b/gettext-tools/tests/gettextpo-1
index 2657a1b..2ad641e 100755
--- a/gettext-tools/tests/gettextpo-1
+++ b/gettext-tools/tests/gettextpo-1
@@ -2,10 +2,10 @@
 . "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the libgettextpo library.
-../gettextpo-1-prg${EXEEXT} "$abs_srcdir"/gettextpo-1.de.po > /dev/null || exit 1
+../gettextpo-1-prg${EXEEXT} "$abs_srcdir"/gettextpo-1.de.po > /dev/null || Exit 1
 
 : ${DIFF=diff}
-${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-copied.po || exit 1
-${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-created.po || exit 1
+${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-copied.po || Exit 1
+${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-created.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettextpo-1-prg.c b/gettext-tools/tests/gettextpo-1-prg.c
index ef53441..407d16a 100644
--- a/gettext-tools/tests/gettextpo-1-prg.c
+++ b/gettext-tools/tests/gettextpo-1-prg.c
@@ -1,5 +1,5 @@
 /* Test of public API for GNU gettext PO files.
-   Copyright (C) 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2010.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/tests/init.sh b/gettext-tools/tests/init.sh
index d366206..97e4e4b 100644
--- a/gettext-tools/tests/init.sh
+++ b/gettext-tools/tests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 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
@@ -308,13 +308,19 @@ if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \
       fi
     }
   fi
-elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
+elif
+  for diff_opt_ in -U3 -c '' no; do
+    test "$diff_opt_" = no && break
+    diff_out_=`exec 2>/dev/null; diff $diff_opt_ "$0" "$0" </dev/null` && break
+  done
+  test "$diff_opt_" != no
+then
   if test -z "$diff_out_"; then
-    compare_ () { diff -c "$@"; }
+    compare_ () { diff $diff_opt_ "$@"; }
   else
     compare_ ()
     {
-      if diff -c "$@" > diff.out; then
+      if diff $diff_opt_ "$@" > diff.out; then
         # No differences were found, but AIX and HP-UX 'diff' produce output
         # "No differences encountered" or "There are no differences between the
         # files.". Hide this output.
@@ -327,7 +333,7 @@ elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
       fi
     }
   fi
-elif ( cmp --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then
+elif cmp -s /dev/null /dev/null 2>/dev/null; then
   compare_ () { cmp -s "$@"; }
 else
   compare_ () { cmp "$@"; }
@@ -466,7 +472,6 @@ setup_ ()
   fi
 
   initial_cwd_=$PWD
-  fail=0
 
   pfx_=`testdir_prefix_`
   test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
@@ -550,8 +555,9 @@ mktempd_ ()
   # Disallow any trailing slash on specified destdir:
   # it would subvert the post-mktemp "case"-based destdir test.
   case $destdir_ in
-  /) ;;
+  / | //) destdir_slash_=$destdir;;
   */) fail_ "invalid destination dir: remove trailing slash(es)";;
+  *) destdir_slash_=$destdir_/;;
   esac
 
   case $template_ in
@@ -561,20 +567,17 @@ mktempd_ ()
   esac
 
   # First, try to use mktemp.
-  d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` \
-    || fail=1
+  d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` &&
 
   # The resulting name must be in the specified directory.
-  case $d in "$destdir_"*);; *) fail=1;; esac
+  case $d in "$destdir_slash_"*) :;; *) false;; esac &&
 
   # It must have created the directory.
-  test -d "$d" || fail=1
+  test -d "$d" &&
 
   # It must have 0700 permissions.  Handle sticky "S" bits.
-  perms=`ls -dgo "$d" 2>/dev/null|tr S -` || fail=1
-  case $perms in drwx------*) ;; *) fail=1;; esac
-
-  test $fail = 0 && {
+  perms=`ls -dgo "$d" 2>/dev/null` &&
+  case $perms in drwx--[-S]---*) :;; *) false;; esac && {
     echo "$d"
     return
   }
@@ -593,7 +596,7 @@ mktempd_ ()
   i_=1
   while :; do
     X_=`rand_bytes_ $nx_`
-    candidate_dir_="$destdir_/$base_template_$X_"
+    candidate_dir_="$destdir_slash_$base_template_$X_"
     err_=`mkdir -m 0700 "$candidate_dir_" 2>&1` \
       && { echo "$candidate_dir_"; return; }
     test $MAX_TRIES_ -le $i_ && break;
diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash
index 7c74651..a5ec2b0 100755
--- a/gettext-tools/tests/lang-bash
+++ b/gettext-tools/tests/lang-bash
@@ -33,8 +33,8 @@ ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.bash \
   >prog.err 2>&1
 result=$?
 cat prog.err | grep -v 'warning: the syntax \$"\.\.\." is deprecated due to security reasons'
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<\EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -48,7 +48,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -68,11 +68,11 @@ msgstr[1] "$n morceaux de gateau"
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -82,10 +82,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of bash version 2.0 or newer.
 (bash -c :) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: bash not found"; exit 77; }
+  || { echo "Skipping test: bash not found"; Exit 77; }
 case `bash -c 'echo $BASH_VERSION'` in
   [2-9].*) ;;
-  *) echo "Skipping test: bash version too old"; exit 77;;
+  *) echo "Skipping test: bash version too old"; Exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -96,7 +96,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -104,7 +104,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -113,18 +113,18 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 case "$host_os" in
   darwin*)
     if test $LOCALE_FR != none; then
       LC_ALL=$LOCALE_FR bash --help \
-        | grep '^Utilisation' > /dev/null 2>&1 || exit 77
+        | grep '^Utilisation' > /dev/null 2>&1 || Exit 77
     fi
     if test $LOCALE_FR_UTF8 != none; then
       LC_ALL=$LOCALE_FR_UTF8 bash --help \
-        | grep '^Utilisation' > /dev/null 2>&1 || exit 77
+        | grep '^Utilisation' > /dev/null 2>&1 || Exit 77
     fi
   ;;
 esac
@@ -148,23 +148,23 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR bash ./prog.bash 2 > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR bash ./prog.bash 2 > prog.out || Exit 1
   : ${DIFF=diff}
   ${DIFF} prog.nok prog.out > /dev/null && {
     echo "Skipping test: bash is built without i18n support"
-    exit 77
+    Exit 77
   }
-  ${DIFF} prog.ok prog.out || exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 bash ./prog.bash 2 > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 bash ./prog.bash 2 > prog.out || Exit 1
   : ${DIFF=diff}
   ${DIFF} prog.nok prog.out > /dev/null && {
     echo "Skipping test: bash is built without i18n support"
-    exit 77
+    Exit 77
   }
-  ${DIFF} prog.oku prog.out || exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c
index f58df88..2babb08 100755
--- a/gettext-tools/tests/lang-c
+++ b/gettext-tools/tests/lang-c
@@ -43,17 +43,17 @@ EOF
 # is found in the build directory, regardless of -I options present in
 # ${CFLAGS} or ${CPPFLAGS}.
 ${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib -I../../intl ${CFLAGS} \
-      ${CPPFLAGS} -c prog.c || exit 1
+      ${CPPFLAGS} -c prog.c || Exit 1
 
 : ${CONFIG_SHELL=${SHELL-/bin/sh}}
 ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CC --mode=link \
                 ${CC} ${CFLAGS} -o prog prog.${OBJEXT} \
                 ../../gnulib-lib/libgettextlib.la ${LDFLAGS} ${LTLIBINTL} \
-		|| exit 1
+		|| Exit 1
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.c || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.c || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 #, c-format
@@ -72,7 +72,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -98,11 +98,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -128,18 +128,18 @@ if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.out
   case $? in
-    0) ${DIFF} prog.ok prog.out || exit 1;;
+    0) ${DIFF} prog.ok prog.out || Exit 1;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.out
   case $? in
-    0) ${DIFF} prog.oku prog.out || exit 1;;
+    0) ${DIFF} prog.oku prog.out || Exit 1;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -148,7 +148,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index 65a8a28..105e70e 100755
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -8,11 +8,11 @@
 # Test whether a C++ compiler is found and libasprintf is built.
 test "${CXX}" != "no" || {
   echo "Skipping test: no C++ compiler found"
-  exit 77
+  Exit 77
 }
 test "${TESTLIBASPRINTF}" = yes || {
   echo "Skipping test: configured with --disable-libasprintf"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > prog.cc
@@ -62,7 +62,7 @@ EOF
 # is found in the build directory, regardless of -I options present in
 # ${CXXFLAGS} or ${CPPFLAGS}.
 ${CXX} -I../.. -I../../../gettext-runtime/libasprintf -I"$abs_top_srcdir"/gnulib-lib -I../../intl ${CXXFLAGS} ${CPPFLAGS} -c prog.cc \
-  || exit 1
+  || Exit 1
 # Remove the -Wl,--disable-auto-import option here that is added by
 # woe32-dll.m4. Cygwin 1.7.2 does not support it in C++ mode: It gives
 # a link error about 'std::cout'.
@@ -71,11 +71,11 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CXX --mode=link \
                 ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o prog prog.${OBJEXT} \
                 ../../../gettext-runtime/libasprintf/libasprintf.la \
                 ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
-		|| exit 1
+		|| Exit 1
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.cc || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.cc || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -93,7 +93,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -118,11 +118,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -148,18 +148,18 @@ if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.out
   case $? in
-    0) ${DIFF} prog.ok prog.out || exit 1;;
+    0) ${DIFF} prog.ok prog.out || Exit 1;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.out
   case $? in
-    0) ${DIFF} prog.oku prog.out || exit 1;;
+    0) ${DIFF} prog.oku prog.out || Exit 1;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -168,7 +168,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp
index 631d30a..471c4f6 100755
--- a/gettext-tools/tests/lang-clisp
+++ b/gettext-tools/tests/lang-clisp
@@ -19,8 +19,8 @@ cat <<\EOF > prog.lisp
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lisp || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lisp || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -38,7 +38,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -63,11 +63,11 @@ msgstr "~1@*~A remplace ~0@*~A."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -79,17 +79,17 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 # Use clisp for the comparison of the version numbers; neither 'expr' nor 'bc'
 # can deal with floating-point numbers.
 (clisp --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: clisp not found"; exit 77; }
+  || { echo "Skipping test: clisp not found"; Exit 77; }
 version=`clisp --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'`
 case $version in
   19* | 20*) # older than 2.25
-    echo "Skipping test: clisp version too old"; exit 77;;
+    echo "Skipping test: clisp version too old"; Exit 77;;
 esac
 version=`echo $version | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
 clisp -norc -x "(sys::exit #+GETTEXT (not (>= $version 2.28)) #-GETTEXT t)" \
       >/dev/null \
   || { echo "Skipping test: clisp was built without gettext support"
-       exit 77
+       Exit 77
      }
 
 # Test which of the fr_FR locales are installed.
@@ -100,7 +100,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -108,7 +108,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -117,7 +117,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -136,15 +136,15 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR clisp prog.lisp 2 > prog.tmp || exit 1
-  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR clisp prog.lisp 2 > prog.tmp || Exit 1
+  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 clisp prog.lisp 2 > prog.tmp || exit 1
-  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 clisp prog.lisp 2 > prog.tmp || Exit 1
+  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp
index 505d979..eccfe54 100755
--- a/gettext-tools/tests/lang-csharp
+++ b/gettext-tools/tests/lang-csharp
@@ -12,15 +12,15 @@
 # Test whether we can build and test C# programs.
 test "${CSHARP_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-csharp"
-  exit 77
+  Exit 77
 }
 test "${BUILDCSHARP}" = yes || {
   echo "Skipping test: C# compiler not found"
-  exit 77
+  Exit 77
 }
 test "${TESTCSHARP}" = yes || {
   echo "Skipping test: C# engine not found"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > program.cs
@@ -47,11 +47,11 @@ class Program {
 EOF
 
 : ${CSHARPCOMP="/bin/sh ../../csharpcomp.sh"}
-${CSHARPCOMP} -o program.exe -L ../../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
+${CSHARPCOMP} -o program.exe -L ../../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || Exit 1
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location program.cs || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location program.cs || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -81,7 +81,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -120,15 +120,15 @@ msgstr "Le nouveau {1} remplace le vieux {0}."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 : ${MSGFMT=msgfmt}
 GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
-${MSGFMT} --csharp -d . -r prog -l fr fr.po || exit 1
+${MSGFMT} --csharp -d . -r prog -l fr fr.po || Exit 1
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
@@ -138,7 +138,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -146,7 +146,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -155,7 +155,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -179,13 +179,13 @@ EOF
 : ${CSHARPEXEC="/bin/sh ../../csharpexec.sh"}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-elisp b/gettext-tools/tests/lang-elisp
index 5823ff7..3081ddc 100755
--- a/gettext-tools/tests/lang-elisp
+++ b/gettext-tools/tests/lang-elisp
@@ -14,8 +14,8 @@ cat <<\EOF > prog.el
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.el || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.el || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -27,7 +27,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -45,11 +45,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -57,4 +57,4 @@ test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk
index 47bcb34..33b6831 100755
--- a/gettext-tools/tests/lang-gawk
+++ b/gettext-tools/tests/lang-gawk
@@ -23,8 +23,8 @@ BEGIN {
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.awk || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.awk || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -42,7 +42,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -67,11 +67,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -81,10 +81,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of gawk version 3.1.3 or newer, excluding version 3.1.5.
 (gawk --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: gawk not found"; exit 77; }
+  || { echo "Skipping test: gawk not found"; Exit 77; }
 case `gawk --version 2>&1 | sed -e 's/^[^0-9]*//'` in
   0.* | 1.* | 2.* | 3.0* | 3.1.0* | 3.1.1* | 3.1.2* | 3.1.5*)
-    echo "Skipping test: gawk version too old"; exit 77;;
+    echo "Skipping test: gawk version too old"; Exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -95,7 +95,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -103,7 +103,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -112,7 +112,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 # Test that gawk wasn't built with --disable-nls.
@@ -122,14 +122,14 @@ if test $LOCALE_FR != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR gawk --version | grep logiciel > /dev/null
   test $? = 0 || {
     echo "Skipping test: gawk was built without i18n support"
-    exit 77
+    Exit 77
   }
 fi
 if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk --version | grep logiciel > /dev/null
   test $? = 0 || {
     echo "Skipping test: gawk was built without i18n support"
-    exit 77
+    Exit 77
   }
 fi
 
@@ -149,13 +149,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR gawk -v n=2 -f prog.awk > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR gawk -v n=2 -f prog.awk > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk -v n=2 -f prog.awk > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk -v n=2 -f prog.awk > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile
index 4023d77..9a2a9b8 100755
--- a/gettext-tools/tests/lang-guile
+++ b/gettext-tools/tests/lang-guile
@@ -22,8 +22,8 @@ cat <<\EOF > prog.scm
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.scm || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.scm || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -41,7 +41,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -66,11 +66,11 @@ msgstr "~1@*~A remplace ~0@*~A."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -80,10 +80,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of guile version 1.7 or newer.
 (guile --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: guile not found"; exit 77; }
+  || { echo "Skipping test: guile not found"; Exit 77; }
 case `guile --version | sed -e 1q | sed -e 's/^[^0-9]*//'` in
   0.* | 1.[0-6] | 1.[0-6].* )
-    echo "Skipping test: guile version too old"; exit 77;;
+    echo "Skipping test: guile version too old"; Exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -94,7 +94,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -102,7 +102,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -111,7 +111,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -130,15 +130,15 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; exit 1; }
+  LANGUAGE= LC_ALL=$LOCALE_FR guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; Exit 1; }
   grep -v '^;;;' prog.err 1>&2
-  ${DIFF} prog.ok prog.out || exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; exit 1; }
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; Exit 1; }
   grep -v '^;;;' prog.err 1>&2
-  ${DIFF} prog.oku prog.out || exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index e09ec86..5582114 100755
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -11,15 +11,15 @@
 # Test whether we can build and test Java programs.
 test "${JAVA_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-java"
-  exit 77
+  Exit 77
 }
 test "${BUILDJAVA}" = yes || {
   echo "Skipping test: Java compiler or jar not found"
-  exit 77
+  Exit 77
 }
 test "${TESTJAVA}" = yes || {
   echo "Skipping test: Java engine not found"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > Program.java
@@ -61,11 +61,11 @@ EOF
 
 : ${JAVACOMP="/bin/sh ../../javacomp.sh"}
 CLASSPATH=../../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d . Program.java 2>prog.err \
-  || { cat prog.err 1>&2; exit 1; }
+  || { cat prog.err 1>&2; Exit 1; }
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location Program.java || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location Program.java || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -95,7 +95,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -134,14 +134,14 @@ msgstr "Le nouveau {1} remplace le vieux {0}."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -j -d . -r prog -l fr fr.po || exit 1
+${MSGFMT} -j -d . -r prog -l fr fr.po || Exit 1
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
@@ -151,7 +151,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -159,7 +159,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -168,7 +168,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -192,13 +192,13 @@ EOF
 : ${JAVAEXEC="/bin/sh ../../javaexec.sh"}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-javascript b/gettext-tools/tests/lang-javascript
index fd018a6..bbed140 100755
--- a/gettext-tools/tests/lang-javascript
+++ b/gettext-tools/tests/lang-javascript
@@ -19,8 +19,8 @@ print(_("%s is replaced by %s.").format("FF", "EUR"));
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.js || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.js || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -32,7 +32,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -44,15 +44,15 @@ msgstr "«Votre commande, s'il vous plait», dit le garçon."
 # Reverse the arguments.
 #, javascript-format
 msgid "%s is replaced by %s."
-msgstr "%s remplace %s."
+msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -62,11 +62,13 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of gjs.
 (gjs -h) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: gjs not found"; exit 77; }
+  || { echo "Skipping test: gjs not found"; Exit 77; }
 (gjs -c imports.gettext) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: gjs gettext module not found"; exit 77; }
+  || { echo "Skipping test: gjs gettext module not found"; Exit 77; }
 (gjs -c imports.format) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: gjs format module not found"; exit 77; }
+    || { echo "Skipping test: gjs format module not found"; Exit 77; }
+(pkg-config gjs-1.0 --atleast-version=1.40) >/dev/null 2>/dev/null \
+    || { echo "Skipping test: gjs version is older than 1.40"; Exit 77; }
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
@@ -76,7 +78,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -84,7 +86,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -93,30 +95,30 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 «Votre commande, s'il vous plait», dit le garçon.
-FF remplace EUR.
+EUR remplace FF.
 EOF
 cat <<\EOF > prog.oku
 «Votre commande, s'il vous plait», dit le garçon.
-FF remplace EUR.
+EUR remplace FF.
 EOF
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR gjs prog.js > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR gjs prog.js > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gjs prog.js > prog.out || exit 1
-  ${DIFF} -u prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gjs prog.js > prog.out || Exit 1
+  ${DIFF} -u prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep
index 4c7e3f2..db314a9 100755
--- a/gettext-tools/tests/lang-librep
+++ b/gettext-tools/tests/lang-librep
@@ -18,8 +18,8 @@ cat <<\EOF > prog.jl
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.jl || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.jl || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -31,7 +31,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -49,11 +49,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -63,10 +63,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of rep version 0.15.3 or newer.
 (rep --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: rep not found"; exit 77; }
+  || { echo "Skipping test: rep not found"; Exit 77; }
 case `rep --version | sed -e 's/^[^0-9]*//'` in
   0.[0-9] | 0.1[0-5] | 0.[0-9].* | 0.1[0-4].* | 0.15.[0-2] )
-    echo "Skipping test: rep version too old"; exit 77;;
+    echo "Skipping test: rep version too old"; Exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -77,7 +77,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -85,7 +85,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -94,7 +94,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -111,13 +111,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR rep --no-rc --batch prog.jl > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR rep --no-rc --batch prog.jl > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 rep --no-rc --batch prog.jl > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 rep --no-rc --batch prog.jl > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-lua b/gettext-tools/tests/lang-lua
index 202ef13..c0e35df 100755
--- a/gettext-tools/tests/lang-lua
+++ b/gettext-tools/tests/lang-lua
@@ -18,8 +18,8 @@ print(string.format(_[==[%s is replaced by %s.]==], "FF", "EUR"))
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lua || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lua || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<\EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -37,7 +37,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -60,11 +60,11 @@ msgstr "%s remplace %s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -75,14 +75,14 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 # Test for presence of lua version 5.0 or newer with gettext support.
 (lua -v) >/dev/null 2>/dev/null
 test $? -le 1 \
-  || { echo "Skipping test: lua not found"; exit 77; }
+  || { echo "Skipping test: lua not found"; Exit 77; }
 case `lua -v 2>&1 | sed -e 's/^[^0-9]*//'` in
   [5-9].*) ;;
-  *) echo "Skipping test: lua version too old"; exit 77;;
+  *) echo "Skipping test: lua version too old"; Exit 77;;
 esac
 { lua -v -l gettext > /dev/null 2>/dev/null; } \
   || { echo "Skipping test: lua gettext module not found"
-       exit 77
+       Exit 77
      }
 
 # Test which of the fr_FR locales are installed.
@@ -93,7 +93,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -101,7 +101,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -110,7 +110,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -129,13 +129,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR lua -l gettext prog.lua > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR lua -l gettext prog.lua > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 lua -l gettext prog.lua > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 lua -l gettext prog.lua > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index 126246f..25ca211 100755
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -17,7 +17,7 @@ int main ()
 EOF
 ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o hello hello.m 2>/dev/null \
   || { echo "Skipping test: Objective C compiler not found"
-       exit 77
+       Exit 77
      }
 
 cat <<\EOF > prog.m
@@ -58,17 +58,17 @@ EOF
 # is found in the build directory, regardless of -I options present in
 # ${CFLAGS} or ${CPPFLAGS}.
 ${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib -I../../intl ${CFLAGS} \
-      ${CPPFLAGS} -c prog.m || exit 1
+      ${CPPFLAGS} -c prog.m || Exit 1
 
 : ${CONFIG_SHELL=${SHELL-/bin/sh}}
 ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CC --mode=link \
                 ${CC} ${CFLAGS} -o prog prog.${OBJEXT} \
                 ../../gnulib-lib/libgettextlib.la ${LDFLAGS} ${LTLIBINTL} \
-		|| exit 1
+		|| Exit 1
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.m || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.m || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 #, c-format
@@ -87,7 +87,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -113,11 +113,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -143,18 +143,18 @@ if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.out
   case $? in
-    0) ${DIFF} prog.ok prog.out || exit 1;;
+    0) ${DIFF} prog.ok prog.out || Exit 1;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.out
   case $? in
-    0) ${DIFF} prog.oku prog.out || exit 1;;
+    0) ${DIFF} prog.oku prog.out || Exit 1;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -163,7 +163,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal
index 76a12b6..a6781e8 100755
--- a/gettext-tools/tests/lang-pascal
+++ b/gettext-tools/tests/lang-pascal
@@ -30,12 +30,12 @@ EOF
 (ppcx64 pascalprog.pp) >/dev/null 2>&1 ||
 {
   echo "Skipping test: Pascal compiler ppc386 or ppcx64 not found"
-  exit 77
+  Exit 77
 }
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o pascalprog.tmp --omit-header --add-location pascalprog.rst || exit 1
-LC_ALL=C tr -d '\r' < pascalprog.tmp > pascalprog.pot || exit 1
+${XGETTEXT} -o pascalprog.tmp --omit-header --add-location pascalprog.rst || Exit 1
+LC_ALL=C tr -d '\r' < pascalprog.tmp > pascalprog.pot || Exit 1
 
 cat <<EOF > pascalprog.ok
 #: pascalprog.question
@@ -49,7 +49,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} pascalprog.ok pascalprog.pot || exit 1
+${DIFF} pascalprog.ok pascalprog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -67,11 +67,11 @@ msgstr "%1:s remplace %0:s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po pascalprog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po pascalprog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -93,16 +93,16 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR ./pascalprog > pascalprog.out || exit 1
+  LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR ./pascalprog > pascalprog.out || Exit 1
   : ${DIFF=diff}
-  ${DIFF} pascalprog.ok pascalprog.out || exit 1
+  ${DIFF} pascalprog.ok pascalprog.out || Exit 1
 fi
 if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
   if test $LOCALE_FR_UTF8 != none; then
     prepare_locale_ fr $LOCALE_FR_UTF8
-    LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR_UTF8 ./pascalprog > pascalprog.out || exit 1
+    LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR_UTF8 ./pascalprog > pascalprog.out || Exit 1
     : ${DIFF=diff}
-    ${DIFF} pascalprog.oku pascalprog.out || exit 1
+    ${DIFF} pascalprog.oku pascalprog.out || Exit 1
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
     if test -f /usr/bin/localedef; then
@@ -110,7 +110,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
     else
       echo "Skipping test: no french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -119,8 +119,8 @@ else
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-perl-1 b/gettext-tools/tests/lang-perl-1
index acf6c97..40b1424 100755
--- a/gettext-tools/tests/lang-perl-1
+++ b/gettext-tools/tests/lang-perl-1
@@ -24,8 +24,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} \
   -k__ --flag=__:1:pass-perl-format --flag=__:1:pass-perl-brace-format \
-  -o prog.tmp --omit-header --no-location program1.pl || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+  -o prog.tmp --omit-header --no-location program1.pl || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -43,7 +43,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -68,11 +68,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -95,20 +95,20 @@ EOF
 # Test for perl with Locale::Messages package.
 perl -e 'use Locale::Messages;' 2>/dev/null \
   || { echo "Skipping test: perl package Locale::Messages is not installed"
-       exit 77
+       Exit 77
      }
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   if test -f /usr/bin/localedef; then
@@ -116,7 +116,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-perl-2 b/gettext-tools/tests/lang-perl-2
index 40b814b..5bc2fa8 100755
--- a/gettext-tools/tests/lang-perl-2
+++ b/gettext-tools/tests/lang-perl-2
@@ -23,8 +23,8 @@ ${XGETTEXT} \
   -k__n:1,2 --flag=__n:1:pass-perl-format --flag=__n:1:pass-perl-brace-format \
             --flag=__n:2:pass-perl-format --flag=__n:2:pass-perl-brace-format \
   -k__x --flag=__x:1:perl-brace-format \
-  -o prog.tmp --omit-header --no-location program2.pl || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+  -o prog.tmp --omit-header --no-location program2.pl || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -42,7 +42,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -67,11 +67,11 @@ msgstr "{new} remplace {old}."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d l-perl-2 || mkdir l-perl-2
 test -d fr || mkdir fr
@@ -95,20 +95,20 @@ EOF
 # Test for perl with libintl-perl package.
 perl -M'Locale::TextDomain' -e '' 2>/dev/null \
   || { echo "Skipping test: perl package libintl-perl is not installed"
-       exit 77
+       Exit 77
      }
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   if test -f /usr/bin/localedef; then
@@ -116,7 +116,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php
index 83a61ab..b8238d5 100755
--- a/gettext-tools/tests/lang-php
+++ b/gettext-tools/tests/lang-php
@@ -18,8 +18,8 @@ cat <<\EOF > prog.php
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.php || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.php || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -31,7 +31,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -47,11 +47,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -62,14 +62,14 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 # Test for presence of php version 4.0 or newer with gettext support.
 (php -v) >/dev/null 2>/dev/null
 test $? -le 1 \
-  || { echo "Skipping test: php not found"; exit 77; }
+  || { echo "Skipping test: php not found"; Exit 77; }
 case `php -v | sed -n -e 1p | sed -e 's/^[^0-9]*//'` in
   [4-9].*) ;;
-  *) echo "Skipping test: php version too old"; exit 77;;
+  *) echo "Skipping test: php version too old"; Exit 77;;
 esac
 { php -m | grep '^gettext$' >/dev/null; } \
   || { echo "Skipping test: php was built without gettext support"
-       exit 77
+       Exit 77
      }
 
 # Test which of the fr_FR locales are installed.
@@ -80,7 +80,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -88,7 +88,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -97,7 +97,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -114,13 +114,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR php -q prog.php > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR php -q prog.php > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 php -q prog.php > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 php -q prog.php > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-po b/gettext-tools/tests/lang-po
index c04a343..c8b90c3 100755
--- a/gettext-tools/tests/lang-po
+++ b/gettext-tools/tests/lang-po
@@ -21,11 +21,11 @@ msgstr ""
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --add-location prog-in.pot || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --add-location prog-in.pot || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 : ${DIFF=diff}
-${DIFF} prog-in.pot prog.pot || exit 1
+${DIFF} prog-in.pot prog.pot || Exit 1
 
 # Test with PO format.
 
@@ -52,10 +52,10 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp.po --omit-header --add-location prog-in.po || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp.po > prog.po || exit 1
+${XGETTEXT} -o prog.tmp.po --omit-header --add-location prog-in.po || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp.po > prog.po || Exit 1
 
 : ${DIFF=diff}
-${DIFF} prog-in.po prog.po || exit 1
+${DIFF} prog-in.po prog.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-python-1 b/gettext-tools/tests/lang-python-1
index f198780..5d482fb 100755
--- a/gettext-tools/tests/lang-python-1
+++ b/gettext-tools/tests/lang-python-1
@@ -19,8 +19,8 @@ print gettext.gettext("%(oldCurrency)s is replaced by %(newCurrency)s.") \
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog1.py || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog1.py || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -32,7 +32,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -50,11 +50,11 @@ msgstr "%(newCurrency)s remplace %(oldCurrency)s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -64,10 +64,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of python version 2.0 or newer.
 (python -V) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: python not found"; exit 77; }
+  || { echo "Skipping test: python not found"; Exit 77; }
 case `python -c 'import sys; print sys.hexversion >= 0x20000F0'` in
   1 | True) ;;
-  *) echo "Skipping test: python version too old"; exit 77;;
+  *) echo "Skipping test: python version too old"; Exit 77;;
 esac
 
 : ${DIFF=diff}
@@ -84,14 +84,14 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR python prog1.py > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR python prog1.py > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
   if test $LOCALE_FR_UTF8 != none; then
     prepare_locale_ fr $LOCALE_FR_UTF8
-    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog1.py > prog.out || exit 1
-    ${DIFF} prog.oku prog.out || exit 1
+    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog1.py > prog.out || Exit 1
+    ${DIFF} prog.oku prog.out || Exit 1
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
     if test -f /usr/bin/localedef; then
@@ -99,7 +99,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
     else
       echo "Skipping test: no french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -108,8 +108,8 @@ else
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-python-2 b/gettext-tools/tests/lang-python-2
index 2f431c7..99e72e8 100755
--- a/gettext-tools/tests/lang-python-2
+++ b/gettext-tools/tests/lang-python-2
@@ -25,8 +25,8 @@ print gettext.gettext("%(oldCurrency)s is replaced by %(newCurrency)s.") \
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog2.py || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog2.py || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -44,7 +44,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -69,11 +69,11 @@ msgstr "%(newCurrency)s remplace %(oldCurrency)s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -83,10 +83,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of python version 2.3 or newer.
 (python -V) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: python not found"; exit 77; }
+  || { echo "Skipping test: python not found"; Exit 77; }
 case `python -c 'import sys; print sys.hexversion >= 0x20300F0'` in
   1 | True) ;;
-  *) echo "Skipping test: python version too old"; exit 77;;
+  *) echo "Skipping test: python version too old"; Exit 77;;
 esac
 
 : ${DIFF=diff}
@@ -105,14 +105,14 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR python prog2.py 2 > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR python prog2.py 2 > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
   if test $LOCALE_FR_UTF8 != none; then
     prepare_locale_ fr $LOCALE_FR_UTF8
-    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog2.py 2 > prog.out || exit 1
-    ${DIFF} prog.oku prog.out || exit 1
+    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog2.py 2 > prog.out || Exit 1
+    ${DIFF} prog.oku prog.out || Exit 1
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
     if test -f /usr/bin/localedef; then
@@ -120,7 +120,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
     else
       echo "Skipping test: no french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -129,8 +129,8 @@ else
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-rst b/gettext-tools/tests/lang-rst
index 6758564..348aa72 100755
--- a/gettext-tools/tests/lang-rst
+++ b/gettext-tools/tests/lang-rst
@@ -20,8 +20,8 @@ rstconv.InvalidOutputFormat='Invalid output format -'
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 #: rstconv.help
@@ -54,7 +54,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 # The output of rstconv is slightly different:
 # - ModuleName:ConstName instead of ModuleName.ConstName
@@ -119,8 +119,8 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok1 prog.pot >/dev/null || ${DIFF} prog.ok2 prog.pot || exit 1
+${DIFF} prog.ok1 prog.pot >/dev/null || ${DIFF} prog.ok2 prog.pot || Exit 1
 
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-sh b/gettext-tools/tests/lang-sh
index af417e6..2737f3a 100755
--- a/gettext-tools/tests/lang-sh
+++ b/gettext-tools/tests/lang-sh
@@ -26,8 +26,8 @@ $echo "`eval_ngettext \"a piece of cake\" \"\\$n pieces of cake\" $n`"
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.sh || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.sh || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<\EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -41,7 +41,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -61,11 +61,11 @@ msgstr[1] "$n morceaux de gateau"
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -81,7 +81,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -89,7 +89,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -98,7 +98,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -115,13 +115,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR sh ./prog.sh 2 > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR sh ./prog.sh 2 > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 sh ./prog.sh 2 > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 sh ./prog.sh 2 > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk
index e21591e..6b3584d 100755
--- a/gettext-tools/tests/lang-smalltalk
+++ b/gettext-tools/tests/lang-smalltalk
@@ -31,8 +31,8 @@ Main new run!
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.st || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.st || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -50,7 +50,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -75,11 +75,11 @@ msgstr "%2 remplace %1."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -89,10 +89,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of gst version 2.0.6 or newer.
 (gst --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: gst not found"; exit 77; }
+  || { echo "Skipping test: gst not found"; Exit 77; }
 case `gst --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'` in
   0.* | 1.* | 2.0 | 2.0.[0-5] | 2.1 | 2.1.[0-1])
-    echo "Skipping test: gst version too old"; exit 77;;
+    echo "Skipping test: gst version too old"; Exit 77;;
 esac
 
 : ${DIFF=diff}
@@ -118,19 +118,19 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR gst -Q prog.st > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR gst -Q prog.st > prog.out || Exit 1
   ${DIFF} prog.ok prog.out > /dev/null ||
     ${DIFF} prog.ok2 prog.out > /dev/null ||
       ${DIFF} prog.ok3 prog.out > /dev/null ||
-        { ${DIFF} prog.ok prog.out; exit 1; }
+        { ${DIFF} prog.ok prog.out; Exit 1; }
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gst -Q prog.st > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gst -Q prog.st > prog.out || Exit 1
   ${DIFF} prog.oku prog.out > /dev/null ||
     ${DIFF} prog.oku2 prog.out > /dev/null ||
       ${DIFF} prog.oku3 prog.out > /dev/null ||
-        { ${DIFF} prog.oku prog.out; exit 1; }
+        { ${DIFF} prog.oku prog.out; Exit 1; }
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   if test -f /usr/bin/localedef; then
@@ -138,7 +138,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl
index e0130cc..1d75788 100755
--- a/gettext-tools/tests/lang-tcl
+++ b/gettext-tools/tests/lang-tcl
@@ -22,8 +22,8 @@ puts [format [::msgcat::mc "%s is replaced by %s."] "FF" "EUR"]
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header -k_ program.tcl || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header -k_ program.tcl || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 #: program.tcl:5
@@ -37,7 +37,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -55,16 +55,16 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d msgs || mkdir msgs
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --tcl -d msgs -l fr fr.po || exit 1
+${MSGFMT} --tcl -d msgs -l fr fr.po || Exit 1
 
 # Test for presence of tclsh with msgcat extension.
 cat <<\EOF > version.tcl
@@ -73,7 +73,7 @@ puts $tcl_version
 EOF
 (tclsh version.tcl) >/dev/null 2>/dev/null \
   || { echo "Skipping test: tclsh not found or msgcat extension not present"
-       exit 77
+       Exit 77
      }
 
 : ${DIFF=diff}
@@ -90,15 +90,15 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || exit 1
-  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || Exit 1
+  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || exit 1
-  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || Exit 1
+  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   if test -f /usr/bin/localedef; then
@@ -106,7 +106,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-vala b/gettext-tools/tests/lang-vala
index 3d27631..b24de6a 100755
--- a/gettext-tools/tests/lang-vala
+++ b/gettext-tools/tests/lang-vala
@@ -19,15 +19,15 @@ EOF
 # Test for presence of valac.
 (valac --version) >/dev/null 2>/dev/null
 test $? -le 1 \
-  || { echo "Skipping test: valac not found"; exit 77; }
+  || { echo "Skipping test: valac not found"; Exit 77; }
 
 : ${VALAC=valac}
 ${VALAC} --Xcc=-DGETTEXT_PACKAGE=\"prog\" prog.vala 2>prog.err \
-  || { cat prog.err 1>&2; exit 1; }
+  || { cat prog.err 1>&2; Exit 1; }
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.vala || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.vala || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -39,7 +39,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -55,11 +55,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -83,18 +83,18 @@ if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR ./prog > prog.out
   case $? in
-    0) ${DIFF} prog.ok prog.out || exit 1;;
+    0) ${DIFF} prog.ok prog.out || Exit 1;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ./prog > prog.out
   case $? in
-    0) ${DIFF} prog.oku prog.out || exit 1;;
+    0) ${DIFF} prog.oku prog.out || Exit 1;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -103,7 +103,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-ycp b/gettext-tools/tests/lang-ycp
index 941d8c2..20ac133 100755
--- a/gettext-tools/tests/lang-ycp
+++ b/gettext-tools/tests/lang-ycp
@@ -14,8 +14,8 @@ cat <<\EOF > prog.ycp
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.ycp || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.ycp || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -33,7 +33,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -58,10 +58,10 @@ msgstr "%2 remplace %1."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgattrib-1 b/gettext-tools/tests/msgattrib-1
index 72aa4f4..1e483ca 100755
--- a/gettext-tools/tests/msgattrib-1
+++ b/gettext-tools/tests/msgattrib-1
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated -o ma-test1.tmp ma-test1.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test1.tmp > ma-test1.out || exit 1
+${MSGATTRIB} --translated -o ma-test1.tmp ma-test1.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test1.tmp > ma-test1.out || Exit 1
 
 cat <<\EOF > ma-test1.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-10 b/gettext-tools/tests/msgattrib-10
index ba529db..8b30d2a 100755
--- a/gettext-tools/tests/msgattrib-10
+++ b/gettext-tools/tests/msgattrib-10
@@ -55,8 +55,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --set-obsolete -o ma-test10.tmp ma-test10.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test10.tmp > ma-test10.out || exit 1
+${MSGATTRIB} --set-obsolete -o ma-test10.tmp ma-test10.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test10.tmp > ma-test10.out || Exit 1
 
 cat <<\EOF > ma-test10.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-11 b/gettext-tools/tests/msgattrib-11
index d036296..86fdc78 100755
--- a/gettext-tools/tests/msgattrib-11
+++ b/gettext-tools/tests/msgattrib-11
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-obsolete -o ma-test11.tmp ma-test11.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test11.tmp > ma-test11.out || exit 1
+${MSGATTRIB} --clear-obsolete -o ma-test11.tmp ma-test11.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test11.tmp > ma-test11.out || Exit 1
 
 cat <<\EOF > ma-test11.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-12 b/gettext-tools/tests/msgattrib-12
index 9587f1d..a05a8c4 100755
--- a/gettext-tools/tests/msgattrib-12
+++ b/gettext-tools/tests/msgattrib-12
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --fuzzy -o ma-test12.tmp ma-test12.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test12.tmp > ma-test12.out || exit 1
+${MSGATTRIB} --fuzzy -o ma-test12.tmp ma-test12.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test12.tmp > ma-test12.out || Exit 1
 
 cat <<\EOF > ma-test12.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-13 b/gettext-tools/tests/msgattrib-13
index f352983..ec1a71b 100755
--- a/gettext-tools/tests/msgattrib-13
+++ b/gettext-tools/tests/msgattrib-13
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --obsolete -o ma-test13.tmp ma-test13.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test13.tmp > ma-test13.out || exit 1
+${MSGATTRIB} --obsolete -o ma-test13.tmp ma-test13.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test13.tmp > ma-test13.out || Exit 1
 
 cat <<\EOF > ma-test13.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-14 b/gettext-tools/tests/msgattrib-14
index 7c811c6..08069de 100755
--- a/gettext-tools/tests/msgattrib-14
+++ b/gettext-tools/tests/msgattrib-14
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --obsolete --no-fuzzy -o ma-test14.tmp ma-test14.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test14.tmp > ma-test14.out || exit 1
+${MSGATTRIB} --obsolete --no-fuzzy -o ma-test14.tmp ma-test14.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test14.tmp > ma-test14.out || Exit 1
 
 cat <<\EOF > ma-test14.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-15 b/gettext-tools/tests/msgattrib-15
index d32e534..fc058b5 100755
--- a/gettext-tools/tests/msgattrib-15
+++ b/gettext-tools/tests/msgattrib-15
@@ -49,8 +49,8 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-fuzzy -o ma-test15.tmp ma-test15.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test15.tmp > ma-test15.out || exit 1
+${MSGATTRIB} --clear-fuzzy -o ma-test15.tmp ma-test15.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test15.tmp > ma-test15.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} ma-test15.po ma-test15.out
diff --git a/gettext-tools/tests/msgattrib-16 b/gettext-tools/tests/msgattrib-16
index 72fefd1..b1df38d 100755
--- a/gettext-tools/tests/msgattrib-16
+++ b/gettext-tools/tests/msgattrib-16
@@ -42,8 +42,8 @@ msgstr "Argumente fehlen."
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --fuzzy -o ma-test16.tmp ma-test16.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test16.tmp > ma-test16.out || exit 1
+${MSGATTRIB} --fuzzy -o ma-test16.tmp ma-test16.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test16.tmp > ma-test16.out || Exit 1
 
 cat <<\EOF > ma-test16.ok
 msgid ""
diff --git a/gettext-tools/tests/msgattrib-17 b/gettext-tools/tests/msgattrib-17
index fcfe915..e5ba429 100755
--- a/gettext-tools/tests/msgattrib-17
+++ b/gettext-tools/tests/msgattrib-17
@@ -42,8 +42,8 @@ msgstr "Argumente fehlen."
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-previous -o ma-test17.tmp ma-test17.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test17.tmp > ma-test17.out || exit 1
+${MSGATTRIB} --clear-previous -o ma-test17.tmp ma-test17.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test17.tmp > ma-test17.out || Exit 1
 
 cat <<\EOF > ma-test17.ok
 msgid ""
diff --git a/gettext-tools/tests/msgattrib-18 b/gettext-tools/tests/msgattrib-18
index 68be0f2..0c04f6f 100755
--- a/gettext-tools/tests/msgattrib-18
+++ b/gettext-tools/tests/msgattrib-18
@@ -55,8 +55,8 @@ EOF
 
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --translated --add-location=file -o ma-test18.tmp ma-test18.po \
-    || exit 1
-LC_ALL=C tr -d '\r' < ma-test18.tmp > ma-test18.out || exit 1
+    || Exit 1
+LC_ALL=C tr -d '\r' < ma-test18.tmp > ma-test18.out || Exit 1
 
 cat <<\EOF > ma-test18.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-19 b/gettext-tools/tests/msgattrib-19
index f517a27..3519b7a 100755
--- a/gettext-tools/tests/msgattrib-19
+++ b/gettext-tools/tests/msgattrib-19
@@ -42,8 +42,8 @@ EOF
 
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --clear-fuzzy --empty -o ma-test19.tmp ma-test19.po \
-    || exit 1
-LC_ALL=C tr -d '\r' < ma-test19.tmp > ma-test19.out || exit 1
+    || Exit 1
+LC_ALL=C tr -d '\r' < ma-test19.tmp > ma-test19.out || Exit 1
 
 cat <<\EOF > ma-test19.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-2 b/gettext-tools/tests/msgattrib-2
index 0ee4f5a..c72e783 100755
--- a/gettext-tools/tests/msgattrib-2
+++ b/gettext-tools/tests/msgattrib-2
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --untranslated -o ma-test2.tmp ma-test2.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test2.tmp > ma-test2.out || exit 1
+${MSGATTRIB} --untranslated -o ma-test2.tmp ma-test2.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test2.tmp > ma-test2.out || Exit 1
 
 cat <<\EOF > ma-test2.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-3 b/gettext-tools/tests/msgattrib-3
index 784da59..9636349 100755
--- a/gettext-tools/tests/msgattrib-3
+++ b/gettext-tools/tests/msgattrib-3
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --no-fuzzy -o ma-test3.tmp ma-test3.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test3.tmp > ma-test3.out || exit 1
+${MSGATTRIB} --no-fuzzy -o ma-test3.tmp ma-test3.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test3.tmp > ma-test3.out || Exit 1
 
 cat <<\EOF > ma-test3.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-4 b/gettext-tools/tests/msgattrib-4
index 913d148..1270777 100755
--- a/gettext-tools/tests/msgattrib-4
+++ b/gettext-tools/tests/msgattrib-4
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --only-fuzzy -o ma-test4.tmp ma-test4.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test4.tmp > ma-test4.out || exit 1
+${MSGATTRIB} --only-fuzzy -o ma-test4.tmp ma-test4.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test4.tmp > ma-test4.out || Exit 1
 
 cat <<\EOF > ma-test4.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-5 b/gettext-tools/tests/msgattrib-5
index 56ef8ff..72d9de1 100755
--- a/gettext-tools/tests/msgattrib-5
+++ b/gettext-tools/tests/msgattrib-5
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --no-obsolete -o ma-test5.tmp ma-test5.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test5.tmp > ma-test5.out || exit 1
+${MSGATTRIB} --no-obsolete -o ma-test5.tmp ma-test5.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test5.tmp > ma-test5.out || Exit 1
 
 cat <<\EOF > ma-test5.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-6 b/gettext-tools/tests/msgattrib-6
index 5a9965d..4946045 100755
--- a/gettext-tools/tests/msgattrib-6
+++ b/gettext-tools/tests/msgattrib-6
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --only-obsolete -o ma-test6.tmp ma-test6.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test6.tmp > ma-test6.out || exit 1
+${MSGATTRIB} --only-obsolete -o ma-test6.tmp ma-test6.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test6.tmp > ma-test6.out || Exit 1
 
 cat <<\EOF > ma-test6.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-7 b/gettext-tools/tests/msgattrib-7
index 0584c9e..40db1c9 100755
--- a/gettext-tools/tests/msgattrib-7
+++ b/gettext-tools/tests/msgattrib-7
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated --only-obsolete -o ma-test7.tmp ma-test7.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test7.tmp > ma-test7.out || exit 1
+${MSGATTRIB} --translated --only-obsolete -o ma-test7.tmp ma-test7.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test7.tmp > ma-test7.out || Exit 1
 
 cat <<\EOF > ma-test7.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-8 b/gettext-tools/tests/msgattrib-8
index c187dd6..9a7f13f 100755
--- a/gettext-tools/tests/msgattrib-8
+++ b/gettext-tools/tests/msgattrib-8
@@ -55,8 +55,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --set-fuzzy -o ma-test8.tmp ma-test8.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test8.tmp > ma-test8.out || exit 1
+${MSGATTRIB} --set-fuzzy -o ma-test8.tmp ma-test8.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test8.tmp > ma-test8.out || Exit 1
 
 cat <<\EOF > ma-test8.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-9 b/gettext-tools/tests/msgattrib-9
index 8269652..e1b3368 100755
--- a/gettext-tools/tests/msgattrib-9
+++ b/gettext-tools/tests/msgattrib-9
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-fuzzy -o ma-test9.tmp ma-test9.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test9.tmp > ma-test9.out || exit 1
+${MSGATTRIB} --clear-fuzzy -o ma-test9.tmp ma-test9.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test9.tmp > ma-test9.out || Exit 1
 
 cat <<\EOF > ma-test9.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-properties-1 b/gettext-tools/tests/msgattrib-properties-1
index 4a5c523..2c25c1f 100755
--- a/gettext-tools/tests/msgattrib-properties-1
+++ b/gettext-tools/tests/msgattrib-properties-1
@@ -30,8 +30,8 @@ with\ wives\ who\ never\ understand=und ihre Frauen verstehen sie nicht
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated --properties-input --properties-output -o ma-s-1.tmp ma-s-1.properties || exit 1
-LC_ALL=C tr -d '\r' < ma-s-1.tmp > ma-s-1.out || exit 1
+${MSGATTRIB} --translated --properties-input --properties-output -o ma-s-1.tmp ma-s-1.properties || Exit 1
+LC_ALL=C tr -d '\r' < ma-s-1.tmp > ma-s-1.out || Exit 1
 
 cat <<\EOF > ma-s-1.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgcat-1 b/gettext-tools/tests/msgcat-1
index 189c95b..a554e8a 100755
--- a/gettext-tools/tests/msgcat-1
+++ b/gettext-tools/tests/msgcat-1
@@ -39,8 +39,8 @@ msgstr "eins"
 EOF
 
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test1.tmp mcat-test1.in1 mcat-test1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test1.tmp > mcat-test1.out || exit 1
+${MSGCAT} -o mcat-test1.tmp mcat-test1.in1 mcat-test1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test1.tmp > mcat-test1.out || Exit 1
 
 cat << EOF > mcat-test1.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-10 b/gettext-tools/tests/msgcat-10
index 624d8c3..a84e001 100755
--- a/gettext-tools/tests/msgcat-10
+++ b/gettext-tools/tests/msgcat-10
@@ -60,8 +60,8 @@ rm -f mcat-test10.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --more-than=0 -o mcat-test10.tmp \
-    mcat-test10.in1 mcat-test10.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test10.tmp > mcat-test10.out || exit 1
+    mcat-test10.in1 mcat-test10.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test10.tmp > mcat-test10.out || Exit 1
 
 cat <<\EOF > mcat-test10.ok
 # #-#-#-#-#  mcat-test10.in1 (xyz)  #-#-#-#-#
diff --git a/gettext-tools/tests/msgcat-11 b/gettext-tools/tests/msgcat-11
index 24854b6..0f6a05a 100755
--- a/gettext-tools/tests/msgcat-11
+++ b/gettext-tools/tests/msgcat-11
@@ -31,8 +31,8 @@ msgstr "immer"
 EOF
 
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test11.tmp mcat-test11.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test11.tmp > mcat-test11.out || exit 1
+${MSGCAT} -o mcat-test11.tmp mcat-test11.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test11.tmp > mcat-test11.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mcat-test11.in mcat-test11.out
diff --git a/gettext-tools/tests/msgcat-12 b/gettext-tools/tests/msgcat-12
index 31a1528..41182cf 100755
--- a/gettext-tools/tests/msgcat-12
+++ b/gettext-tools/tests/msgcat-12
@@ -44,6 +44,6 @@ EOF
 rm -f mcat-test12.out
 : ${MSGCAT=msgcat}
 ${MSGCAT} -o mcat-test12.out mcat-test12.in1 mcat-test12.in2 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgcat-13 b/gettext-tools/tests/msgcat-13
index 9f972eb..44d7658 100755
--- a/gettext-tools/tests/msgcat-13
+++ b/gettext-tools/tests/msgcat-13
@@ -67,8 +67,8 @@ EOF
 
 rm -f mcat-test13.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test13.tmp mcat-test13.in1 mcat-test13.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test13.tmp > mcat-test13.out || exit 1
+${MSGCAT} -o mcat-test13.tmp mcat-test13.in1 mcat-test13.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test13.tmp > mcat-test13.out || Exit 1
 
 cat <<\EOF > mcat-test13.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-14 b/gettext-tools/tests/msgcat-14
index 475e9e6..21a544b 100755
--- a/gettext-tools/tests/msgcat-14
+++ b/gettext-tools/tests/msgcat-14
@@ -68,6 +68,6 @@ EOF
 rm -f mcat-test14.out
 : ${MSGCAT=msgcat}
 ${MSGCAT} -o mcat-test14.out mcat-test14.in1 mcat-test14.in2 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgcat-15 b/gettext-tools/tests/msgcat-15
index 046502c..7731e5b 100755
--- a/gettext-tools/tests/msgcat-15
+++ b/gettext-tools/tests/msgcat-15
@@ -43,8 +43,8 @@ EOF
 
 rm -f mcat-test15.tmp1
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test15.tmp1 mcat-test15.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1 || exit 1
+${MSGCAT} -o mcat-test15.tmp1 mcat-test15.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1 || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mcat-test15.in mcat-test15.out1
@@ -52,8 +52,8 @@ result=$?
 
 rm -f mcat-test15.tmp2
 : ${MSGCAT=msgcat}
-${MSGCAT} --indent -o mcat-test15.tmp2 mcat-test15.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2 || exit 1
+${MSGCAT} --indent -o mcat-test15.tmp2 mcat-test15.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2 || Exit 1
 
 cat <<\EOF > mcat-test15.ok
 msgid   ""
diff --git a/gettext-tools/tests/msgcat-16 b/gettext-tools/tests/msgcat-16
index 7a8a479..424be01 100755
--- a/gettext-tools/tests/msgcat-16
+++ b/gettext-tools/tests/msgcat-16
@@ -43,8 +43,8 @@ EOF
 
 rm -f mcat-test16.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test16.tmp mcat-test16.in1 mcat-test16.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test16.tmp > mcat-test16.out || exit 1
+${MSGCAT} -o mcat-test16.tmp mcat-test16.in1 mcat-test16.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test16.tmp > mcat-test16.out || Exit 1
 
 cat <<\EOF > mcat-test16.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-17 b/gettext-tools/tests/msgcat-17
index 40bc785..8fecc40 100755
--- a/gettext-tools/tests/msgcat-17
+++ b/gettext-tools/tests/msgcat-17
@@ -20,8 +20,8 @@ EOF
 
 rm -f mcat-test17.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test17.tmp --width=80 mcat-test17.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test17.tmp > mcat-test17.out || exit 1
+${MSGCAT} -o mcat-test17.tmp --width=80 mcat-test17.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test17.tmp > mcat-test17.out || Exit 1
 
 cat <<\EOF > mcat-test17.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-18 b/gettext-tools/tests/msgcat-18
index afe9d57..03170f6 100755
--- a/gettext-tools/tests/msgcat-18
+++ b/gettext-tools/tests/msgcat-18
@@ -55,8 +55,8 @@ EOF
 
 rm -f mcat-test18.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test18.tmp mcat-test18.in1 mcat-test18.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test18.tmp > mcat-test18.out || exit 1
+${MSGCAT} -o mcat-test18.tmp mcat-test18.in1 mcat-test18.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test18.tmp > mcat-test18.out || Exit 1
 
 cat <<\EOF > mcat-test18.ok
 #, c-format
diff --git a/gettext-tools/tests/msgcat-19 b/gettext-tools/tests/msgcat-19
index 4dd2a40..7068a83 100755
--- a/gettext-tools/tests/msgcat-19
+++ b/gettext-tools/tests/msgcat-19
@@ -39,8 +39,8 @@ EOF
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --add-location=file \
-          -o mcat-test19.tmp mcat-test19.in1 mcat-test19.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test19.tmp > mcat-test19.out || exit 1
+          -o mcat-test19.tmp mcat-test19.in1 mcat-test19.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test19.tmp > mcat-test19.out || Exit 1
 
 cat << EOF > mcat-test19.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-2 b/gettext-tools/tests/msgcat-2
index 11439f9..f4caa61 100755
--- a/gettext-tools/tests/msgcat-2
+++ b/gettext-tools/tests/msgcat-2
@@ -58,8 +58,8 @@ ${MSGCAT} --more-than=0 -o mcat-test2.tmp \
     mcat-test2.in1 mcat-test2.in2 >mcat-test2.err 2>&1
 result=$?
 cat mcat-test2.err | grep -v 'warning: .* encodings' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcat-test2.tmp > mcat-test2.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test2.tmp > mcat-test2.out || Exit 1
 
 cat << \EOF > mcat-test2.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-20 b/gettext-tools/tests/msgcat-20
index 2960fb6..8685f65 100755
--- a/gettext-tools/tests/msgcat-20
+++ b/gettext-tools/tests/msgcat-20
@@ -30,8 +30,8 @@ msgstr "4"
 EOF
 
 : ${MSGCAT=msgcat}
-${MSGCAT} --sort-by-file -o mcat-test20.tmp mcat-test20.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test20.tmp > mcat-test20.out || exit 1
+${MSGCAT} --sort-by-file -o mcat-test20.tmp mcat-test20.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test20.tmp > mcat-test20.out || Exit 1
 
 cat << EOF > mcat-test20.ok
 #: clients/inst_language.ycp:103
diff --git a/gettext-tools/tests/msgcat-3 b/gettext-tools/tests/msgcat-3
index 990b612..bf757c4 100755
--- a/gettext-tools/tests/msgcat-3
+++ b/gettext-tools/tests/msgcat-3
@@ -59,8 +59,8 @@ ${MSGCAT} --use-first --more-than=0 -o mcat-test3.tmp \
     mcat-test3.in1 mcat-test3.in2 >mcat-test3.err 2>&1
 result=$?
 cat mcat-test3.err | grep -v 'warning: .* encodings' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcat-test3.tmp > mcat-test3.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test3.tmp > mcat-test3.out || Exit 1
 
 cat << \EOF > mcat-test3.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-4 b/gettext-tools/tests/msgcat-4
index b593fd4..5e9a3bc 100755
--- a/gettext-tools/tests/msgcat-4
+++ b/gettext-tools/tests/msgcat-4
@@ -59,8 +59,8 @@ ${MSGCAT} --use-first --more-than=0 -o mcat-test4.tmp \
     mcat-test4.in1 mcat-test4.in2 >mcat-test4.err 2>&1
 result=$?
 cat mcat-test4.err | grep -v 'warning: .* encodings' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcat-test4.tmp > mcat-test4.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test4.tmp > mcat-test4.out || Exit 1
 
 cat << \EOF > mcat-test4.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-5 b/gettext-tools/tests/msgcat-5
index 8cdde50..ced04e2 100755
--- a/gettext-tools/tests/msgcat-5
+++ b/gettext-tools/tests/msgcat-5
@@ -56,8 +56,8 @@ rm -f mcat-test5.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --use-first --more-than=0 -o mcat-test5.tmp \
-    mcat-test5.in1 mcat-test5.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test5.tmp > mcat-test5.out || exit 1
+    mcat-test5.in1 mcat-test5.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test5.tmp > mcat-test5.out || Exit 1
 
 cat << \EOF > mcat-test5.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-6 b/gettext-tools/tests/msgcat-6
index dbb2cff..969c88d 100755
--- a/gettext-tools/tests/msgcat-6
+++ b/gettext-tools/tests/msgcat-6
@@ -56,8 +56,8 @@ rm -f mcat-test6.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --more-than=0 -o mcat-test6.tmp \
-    mcat-test6.in1 mcat-test6.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test6.tmp > mcat-test6.out || exit 1
+    mcat-test6.in1 mcat-test6.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test6.tmp > mcat-test6.out || Exit 1
 
 cat << \EOF > mcat-test6.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-7 b/gettext-tools/tests/msgcat-7
index 9a11f27..93890e3 100755
--- a/gettext-tools/tests/msgcat-7
+++ b/gettext-tools/tests/msgcat-7
@@ -17,8 +17,8 @@ EOF
 
 rm -f mcat-test7.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} --sort-output -o mcat-test7.tmp mcat-test7.in1 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test7.tmp > mcat-test7.out || exit 1
+${MSGCAT} --sort-output -o mcat-test7.tmp mcat-test7.in1 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test7.tmp > mcat-test7.out || Exit 1
 
 cat << EOF > mcat-test7.ok
 #: clients/inst_language.ycp:108
diff --git a/gettext-tools/tests/msgcat-8 b/gettext-tools/tests/msgcat-8
index f757138..d8f0765 100755
--- a/gettext-tools/tests/msgcat-8
+++ b/gettext-tools/tests/msgcat-8
@@ -57,8 +57,8 @@ rm -f mcat-test8.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --more-than=0 -o mcat-test8.tmp \
-    mcat-test8.in1 mcat-test8.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test8.tmp > mcat-test8.out || exit 1
+    mcat-test8.in1 mcat-test8.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test8.tmp > mcat-test8.out || Exit 1
 
 cat <<\EOF > mcat-test8.ok
 # #-#-#-#-#  mcat-test8.in1 (xyz)  #-#-#-#-#
diff --git a/gettext-tools/tests/msgcat-9 b/gettext-tools/tests/msgcat-9
index 54f6cf1..558e623 100755
--- a/gettext-tools/tests/msgcat-9
+++ b/gettext-tools/tests/msgcat-9
@@ -56,8 +56,8 @@ rm -f mcat-test9.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --more-than=0 -o mcat-test9.tmp \
-    mcat-test9.in1 mcat-test9.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test9.tmp > mcat-test9.out || exit 1
+    mcat-test9.in1 mcat-test9.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test9.tmp > mcat-test9.out || Exit 1
 
 cat <<\EOF > mcat-test9.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-properties-1 b/gettext-tools/tests/msgcat-properties-1
index 1c53524..5d2263a 100755
--- a/gettext-tools/tests/msgcat-properties-1
+++ b/gettext-tools/tests/msgcat-properties-1
@@ -19,8 +19,8 @@ rm -f mcat-p-1.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --use-first --more-than=0 --properties-input --properties-output \
-    -o mcat-p-1.tmp mcat-p-1.in1 mcat-p-1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out || exit 1
+    -o mcat-p-1.tmp mcat-p-1.in1 mcat-p-1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out || Exit 1
 
 cat << \EOF > mcat-p-1.ok
 #. Help text (HTML-like) START
diff --git a/gettext-tools/tests/msgcat-properties-2 b/gettext-tools/tests/msgcat-properties-2
index 3c57dea..badc6f3 100755
--- a/gettext-tools/tests/msgcat-properties-2
+++ b/gettext-tools/tests/msgcat-properties-2
@@ -10,7 +10,7 @@ exactly\ 2\ input\ files\ required=\u6b64\u529f\u80fd\u9700\u8981\u6070\u597d\u6
 EOF
 
 : ${MSGCAT=msgcat}
-${MSGCAT} --properties-input --properties-output -t Big5 -o mcat-p-2.out mcat-p-2.properties || exit 1
+${MSGCAT} --properties-input --properties-output -t Big5 -o mcat-p-2.out mcat-p-2.properties || Exit 1
 
 : ${DIFF=diff}
 # Redirect stdout, so as not to fill the user's screen with non-ASCII bytes.
diff --git a/gettext-tools/tests/msgcat-stringtable-1 b/gettext-tools/tests/msgcat-stringtable-1
index 2ab9295..355b836 100755
--- a/gettext-tools/tests/msgcat-stringtable-1
+++ b/gettext-tools/tests/msgcat-stringtable-1
@@ -30,8 +30,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGCAT} --stringtable-input -o mcat-s-1.tmp mcat-s-1.in >mcat-s-1.err 2>&1
 result=$?
 cat mcat-s-1.err | grep -v ': internationalized messages'
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out || Exit 1
 
 cat << \EOF > mcat-s-1.ok
 # This is an example of a string table file. Everything inside a comment
diff --git a/gettext-tools/tests/msgcmp-4 b/gettext-tools/tests/msgcmp-4
index 1f80683..dd077f8 100755
--- a/gettext-tools/tests/msgcmp-4
+++ b/gettext-tools/tests/msgcmp-4
@@ -86,17 +86,17 @@ EOF
 # Verify that with fuzzies, all msgids of the POT file are covered.
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
-${MSGCMP} --use-fuzzy mc-test4.po1 mc-test4.pot > mc-test4.out11 2>&1 || exit 1
+${MSGCMP} --use-fuzzy mc-test4.po1 mc-test4.pot > mc-test4.out11 2>&1 || Exit 1
 if grep -v 'warning:' mc-test4.out11 > /dev/null; then
-  exit 1;
+  Exit 1;
 fi
 
 # Verify that without fuzzies, not all msgids of the POT file are covered.
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
 ${MSGCMP} mc-test4.po1 mc-test4.pot > mc-test4.out12 2>&1
-test $? = 1 || { exit 1; }
-grep -v 'warning:' mc-test4.out12 > /dev/null || exit 1
+test $? = 1 || { Exit 1; }
+grep -v 'warning:' mc-test4.out12 > /dev/null || Exit 1
 
 cat <<\EOF > mc-test4.po2
 msgid ""
@@ -144,9 +144,9 @@ EOF
 # messages.
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
-${MSGCMP} mc-test4.po2 mc-test4.pot > mc-test4.out2 2>&1 || exit 1
+${MSGCMP} mc-test4.po2 mc-test4.pot > mc-test4.out2 2>&1 || Exit 1
 if grep -v 'warning:' mc-test4.out2 > /dev/null; then
-  exit 1;
+  Exit 1;
 fi
 
 exit $result
diff --git a/gettext-tools/tests/msgcomm-1 b/gettext-tools/tests/msgcomm-1
index 52b8e0a..67ab936 100755
--- a/gettext-tools/tests/msgcomm-1
+++ b/gettext-tools/tests/msgcomm-1
@@ -16,8 +16,8 @@ msgstr "2x"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test1.tmp mcomm-test1.in1 mcomm-test1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test1.tmp mcomm-test1.in1 mcomm-test1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out || Exit 1
 
 cat << EOF > mcomm-test1.ok
 #: first.c:123
diff --git a/gettext-tools/tests/msgcomm-10 b/gettext-tools/tests/msgcomm-10
index 71402f4..7dca8c0 100755
--- a/gettext-tools/tests/msgcomm-10
+++ b/gettext-tools/tests/msgcomm-10
@@ -39,8 +39,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test10.tmp \
-    mcomm-test10.in1 mcomm-test10.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out || exit 1
+    mcomm-test10.in1 mcomm-test10.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out || Exit 1
 
 cat << EOF > mcomm-test10.ok
 msgid "1"
diff --git a/gettext-tools/tests/msgcomm-11 b/gettext-tools/tests/msgcomm-11
index 7994cec..cecee3f 100755
--- a/gettext-tools/tests/msgcomm-11
+++ b/gettext-tools/tests/msgcomm-11
@@ -43,8 +43,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test11.tmp \
-    mcomm-test11.in1 mcomm-test11.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out || exit 1
+    mcomm-test11.in1 mcomm-test11.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out || Exit 1
 
 cat << EOF > mcomm-test11.ok
 msgid "1"
diff --git a/gettext-tools/tests/msgcomm-12 b/gettext-tools/tests/msgcomm-12
index 3f494f3..8c7ff78 100755
--- a/gettext-tools/tests/msgcomm-12
+++ b/gettext-tools/tests/msgcomm-12
@@ -65,8 +65,8 @@ EOF
 # --unique is shorthand for --less-than=2; do we've to test both
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test12.tmp \
-    mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out || exit 1
+    mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out || Exit 1
 
 cat << EOF > mcomm-test12.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-13 b/gettext-tools/tests/msgcomm-13
index 04eebb4..9f21eab 100755
--- a/gettext-tools/tests/msgcomm-13
+++ b/gettext-tools/tests/msgcomm-13
@@ -68,8 +68,8 @@ EOF
 # --unique is shorthand for --less-than=2; do we've to test both
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test13.tmp \
-    mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out || exit 1
+    mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out || Exit 1
 
 cat << EOF > mcomm-test13.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-14 b/gettext-tools/tests/msgcomm-14
index 6741a5a..3e0401b 100755
--- a/gettext-tools/tests/msgcomm-14
+++ b/gettext-tools/tests/msgcomm-14
@@ -63,8 +63,8 @@ EOF
 # --unique is shorthand for --less-than=2; do we've to test both
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test14.tmp \
-    mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out || exit 1
+    mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out || Exit 1
 
 cat << EOF > mcomm-test14.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-15 b/gettext-tools/tests/msgcomm-15
index 291e349..043cf13 100755
--- a/gettext-tools/tests/msgcomm-15
+++ b/gettext-tools/tests/msgcomm-15
@@ -66,7 +66,7 @@ rm -f mcomm-test15.out
 # --unique is shorthand for --less-than=2; do we've to test both
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location -o mcomm-test15.out \
-    mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3 || exit 1
+    mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3 || Exit 1
 
 # we've no unique msg; thus no PO should be created.
 if test -f mcomm-test15.out; then
diff --git a/gettext-tools/tests/msgcomm-16 b/gettext-tools/tests/msgcomm-16
index f0a3b13..6b7f6f3 100755
--- a/gettext-tools/tests/msgcomm-16
+++ b/gettext-tools/tests/msgcomm-16
@@ -58,8 +58,8 @@ ${MSGCOMM} --more-than=0 -o mcomm-test16.tmp \
     mcomm-test16.in1 mcomm-test16.in2 >mcomm-test16.err 2>&1
 result=$?
 cat mcomm-test16.err | grep -v 'warning: .* encodings' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out || Exit 1
 
 cat << \EOF > mcomm-test16.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcomm-17 b/gettext-tools/tests/msgcomm-17
index 1867fe9..2ec6675 100755
--- a/gettext-tools/tests/msgcomm-17
+++ b/gettext-tools/tests/msgcomm-17
@@ -66,8 +66,8 @@ EOF
 
 ${MSGCOMM} -u \
            -o mcomm-test17.tmp \
-           mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out || exit 1
+           mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out || Exit 1
 
 cat << \EOF > mcomm-test17.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-18 b/gettext-tools/tests/msgcomm-18
index d57af85..2dab53e 100755
--- a/gettext-tools/tests/msgcomm-18
+++ b/gettext-tools/tests/msgcomm-18
@@ -18,8 +18,8 @@ msgstr "1x"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test18.tmp mcomm-test18.in1 mcomm-test18.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test18.tmp mcomm-test18.in1 mcomm-test18.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out || Exit 1
 
 cat << EOF > mcomm-test18.ok
 # Sure.
diff --git a/gettext-tools/tests/msgcomm-19 b/gettext-tools/tests/msgcomm-19
index 2587bc4..0b693ad 100755
--- a/gettext-tools/tests/msgcomm-19
+++ b/gettext-tools/tests/msgcomm-19
@@ -20,8 +20,8 @@ msgstr "1x"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test19.tmp mcomm-test19.in1 mcomm-test19.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test19.tmp mcomm-test19.in1 mcomm-test19.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out || Exit 1
 
 cat << EOF > mcomm-test19.ok
 # Not sure.
diff --git a/gettext-tools/tests/msgcomm-2 b/gettext-tools/tests/msgcomm-2
index ae26bd0..f93d58d 100755
--- a/gettext-tools/tests/msgcomm-2
+++ b/gettext-tools/tests/msgcomm-2
@@ -17,8 +17,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --no-location -o mcomm-test2.tmp \
-    mcomm-test2.in1 mcomm-test2.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out || exit 1
+    mcomm-test2.in1 mcomm-test2.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out || Exit 1
 
 cat << EOF > mcomm-test2.ok
 msgid "1"
diff --git a/gettext-tools/tests/msgcomm-20 b/gettext-tools/tests/msgcomm-20
index 69b2ff1..3beb31c 100755
--- a/gettext-tools/tests/msgcomm-20
+++ b/gettext-tools/tests/msgcomm-20
@@ -21,8 +21,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 -o mcomm-test20.tmp \
-    mcomm-test20.in1 mcomm-test20.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out || exit 1
+    mcomm-test20.in1 mcomm-test20.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out || Exit 1
 
 cat << EOF > mcomm-test20.ok
 # Sure.
diff --git a/gettext-tools/tests/msgcomm-21 b/gettext-tools/tests/msgcomm-21
index 9d3adc2..fa32600 100755
--- a/gettext-tools/tests/msgcomm-21
+++ b/gettext-tools/tests/msgcomm-21
@@ -21,8 +21,8 @@ msgstr "1x"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test21.tmp mcomm-test21.in1 mcomm-test21.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test21.tmp mcomm-test21.in1 mcomm-test21.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out || Exit 1
 
 cat << EOF > mcomm-test21.ok
 # Not sure.
diff --git a/gettext-tools/tests/msgcomm-22 b/gettext-tools/tests/msgcomm-22
index 6b07432..72f3807 100755
--- a/gettext-tools/tests/msgcomm-22
+++ b/gettext-tools/tests/msgcomm-22
@@ -64,8 +64,8 @@ rm -f mcomm-test22.tmp
 : ${MSGCOMM=msgcomm}
 
 ${MSGCOMM} --less-than=2 -o mcomm-test22.tmp \
-    mcomm-test22.in1 mcomm-test22.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out || exit 1
+    mcomm-test22.in1 mcomm-test22.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out || Exit 1
 
 cat << \EOF > mcomm-test22.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msgcomm-23 b/gettext-tools/tests/msgcomm-23
index c9d7846..873ba6c 100755
--- a/gettext-tools/tests/msgcomm-23
+++ b/gettext-tools/tests/msgcomm-23
@@ -7,8 +7,8 @@ cp "$abs_srcdir"/msguniq-a.in mcomm-23.in1
 cp "$abs_srcdir"/msguniq-a.in mcomm-23.in2
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} -w 1000 -o mcomm-23.tmp mcomm-23.in1 mcomm-23.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out || exit 1
+${MSGCOMM} -w 1000 -o mcomm-23.tmp mcomm-23.in1 mcomm-23.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} "$abs_srcdir"/msguniq-a.out mcomm-23.out
diff --git a/gettext-tools/tests/msgcomm-24 b/gettext-tools/tests/msgcomm-24
index f56f378..2cc5f95 100755
--- a/gettext-tools/tests/msgcomm-24
+++ b/gettext-tools/tests/msgcomm-24
@@ -14,8 +14,8 @@ cat <<EOF > mcomm-test24.in2
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 --properties-input --properties-output -o mcomm-test24.tmp mcomm-test24.in1 mcomm-test24.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out || exit 1
+${MSGCOMM} --more-than=0 --properties-input --properties-output -o mcomm-test24.tmp mcomm-test24.in1 mcomm-test24.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out || Exit 1
 
 cat << EOF > mcomm-test24.ok
 #: first.c:123
diff --git a/gettext-tools/tests/msgcomm-25 b/gettext-tools/tests/msgcomm-25
index 0b766b6..3a04b8a 100755
--- a/gettext-tools/tests/msgcomm-25
+++ b/gettext-tools/tests/msgcomm-25
@@ -66,8 +66,8 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test25.tmp mcomm-test25.in1 mcomm-test25.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test25.tmp mcomm-test25.in1 mcomm-test25.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out || Exit 1
 
 cat <<\EOF > mcomm-test25.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-26 b/gettext-tools/tests/msgcomm-26
index dfb3ab9..64ac62e 100755
--- a/gettext-tools/tests/msgcomm-26
+++ b/gettext-tools/tests/msgcomm-26
@@ -68,8 +68,8 @@ msgstr "%s: ungültige Optionen -- %c\n"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} -o mcomm-test26.tmp mcomm-test26.in1 mcomm-test26.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out || exit 1
+${MSGCOMM} -o mcomm-test26.tmp mcomm-test26.in1 mcomm-test26.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out || Exit 1
 
 cat <<\EOF > mcomm-test26.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-27 b/gettext-tools/tests/msgcomm-27
index b11a0eb..fda523e 100755
--- a/gettext-tools/tests/msgcomm-27
+++ b/gettext-tools/tests/msgcomm-27
@@ -54,8 +54,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} -o mcomm-test27.tmp mcomm-test27.in1 mcomm-test27.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test27.tmp > mcomm-test27.out || exit 1
+${MSGCOMM} -o mcomm-test27.tmp mcomm-test27.in1 mcomm-test27.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test27.tmp > mcomm-test27.out || Exit 1
 
 cat << EOF > mcomm-test27.ok
 #, c-format
diff --git a/gettext-tools/tests/msgcomm-28 b/gettext-tools/tests/msgcomm-28
index 665ab0a..48f7761 100755
--- a/gettext-tools/tests/msgcomm-28
+++ b/gettext-tools/tests/msgcomm-28
@@ -17,8 +17,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --add-location=file --more-than=0 \
-           -o mcomm-test28.tmp mcomm-test28.in1 mcomm-test28.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test28.tmp > mcomm-test28.out || exit 1
+           -o mcomm-test28.tmp mcomm-test28.in1 mcomm-test28.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test28.tmp > mcomm-test28.out || Exit 1
 
 cat << EOF > mcomm-test28.ok
 #: first.c
diff --git a/gettext-tools/tests/msgcomm-3 b/gettext-tools/tests/msgcomm-3
index d5871e5..67baccd 100755
--- a/gettext-tools/tests/msgcomm-3
+++ b/gettext-tools/tests/msgcomm-3
@@ -17,8 +17,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test3.tmp \
-    mcomm-test3.in1 mcomm-test3.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out || exit 1
+    mcomm-test3.in1 mcomm-test3.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out || Exit 1
 
 cat << EOF > mcomm-test3.ok
 #: first.c:123
diff --git a/gettext-tools/tests/msgcomm-4 b/gettext-tools/tests/msgcomm-4
index de9c9c1..a292da4 100755
--- a/gettext-tools/tests/msgcomm-4
+++ b/gettext-tools/tests/msgcomm-4
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 -o mcomm-test4.tmp \
-    mcomm-test4.in1 mcomm-test4.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out || exit 1
+    mcomm-test4.in1 mcomm-test4.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out || Exit 1
 
 cat << EOF > mcomm-test4.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-5 b/gettext-tools/tests/msgcomm-5
index d17467d..1eb7acd 100755
--- a/gettext-tools/tests/msgcomm-5
+++ b/gettext-tools/tests/msgcomm-5
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test5.tmp \
-    mcomm-test5.in1 mcomm-test5.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out || exit 1
+    mcomm-test5.in1 mcomm-test5.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out || Exit 1
 
 cat << EOF > mcomm-test5.ok
 #: first.c:123
diff --git a/gettext-tools/tests/msgcomm-6 b/gettext-tools/tests/msgcomm-6
index 9b0a5a1..634d8db 100755
--- a/gettext-tools/tests/msgcomm-6
+++ b/gettext-tools/tests/msgcomm-6
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --no-location -o mcomm-test6.tmp \
-    mcomm-test6.in1 mcomm-test6.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out || exit 1
+    mcomm-test6.in1 mcomm-test6.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out || Exit 1
 
 cat << EOF > mcomm-test6.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-7 b/gettext-tools/tests/msgcomm-7
index 1b5c812..b098ec7 100755
--- a/gettext-tools/tests/msgcomm-7
+++ b/gettext-tools/tests/msgcomm-7
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --no-location --omit-header -o mcomm-test7.tmp \
-    mcomm-test7.in1 mcomm-test7.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out || exit 1
+    mcomm-test7.in1 mcomm-test7.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out || Exit 1
 
 cat << EOF > mcomm-test7.ok
 msgid "1"
diff --git a/gettext-tools/tests/msgcomm-8 b/gettext-tools/tests/msgcomm-8
index e08e70f..582deff 100755
--- a/gettext-tools/tests/msgcomm-8
+++ b/gettext-tools/tests/msgcomm-8
@@ -39,8 +39,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 -o mcomm-test8.tmp \
-    mcomm-test8.in1 mcomm-test8.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out || exit 1
+    mcomm-test8.in1 mcomm-test8.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out || Exit 1
 
 cat << EOF > mcomm-test8.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-9 b/gettext-tools/tests/msgcomm-9
index 632ec1f..fdb37b9 100755
--- a/gettext-tools/tests/msgcomm-9
+++ b/gettext-tools/tests/msgcomm-9
@@ -39,8 +39,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 --no-location -o mcomm-test9.tmp \
-    mcomm-test9.in1 mcomm-test9.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out || exit 1
+    mcomm-test9.in1 mcomm-test9.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out || Exit 1
 
 cat << EOF > mcomm-test9.ok
 msgid ""
diff --git a/gettext-tools/tests/msgconv-1 b/gettext-tools/tests/msgconv-1
index 148f982..810e37d 100755
--- a/gettext-tools/tests/msgconv-1
+++ b/gettext-tools/tests/msgconv-1
@@ -18,7 +18,7 @@ msgstr "¦¹¥\¯à»Ý­n«ê¦n«ü©w¨â­Ó¿é¤JÀÉ"
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mco-test1.out mco-test1.po || exit 1
+${MSGCONV} --to-code=UTF-8 -o mco-test1.out mco-test1.po || Exit 1
 
 cat <<\EOF > mco-test1.ok
 # Chinese translation for GNU gettext messages.
diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2
index 936197c..5e4e027 100755
--- a/gettext-tools/tests/msgconv-2
+++ b/gettext-tools/tests/msgconv-2
@@ -19,7 +19,7 @@ msgstr "此功能需��好指定兩個輸入檔"
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} -t Big5 -o mco-test2.out mco-test2.po || exit 1
+${MSGCONV} -t Big5 -o mco-test2.out mco-test2.po || Exit 1
 
 cat <<\EOF > mco-test2.ok
 # Chinese translation for GNU gettext messages.
diff --git a/gettext-tools/tests/msgconv-4 b/gettext-tools/tests/msgconv-4
index b901142..5cddce7 100755
--- a/gettext-tools/tests/msgconv-4
+++ b/gettext-tools/tests/msgconv-4
@@ -10,7 +10,7 @@ exactly\ 2\ input\ files\ required=\u6b64\u529f\u80fd\u9700\u8981\u6070\u597d\u6
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --properties-input --properties-output -t Big5 -o mco-test4.out mco-test4.properties || exit 1
+${MSGCONV} --properties-input --properties-output -t Big5 -o mco-test4.out mco-test4.properties || Exit 1
 
 : ${DIFF=diff}
 # Redirect stdout, so as not to fill the user's screen with non-ASCII bytes.
diff --git a/gettext-tools/tests/msgconv-5 b/gettext-tools/tests/msgconv-5
index 800805f..4d20384 100755
--- a/gettext-tools/tests/msgconv-5
+++ b/gettext-tools/tests/msgconv-5
@@ -49,8 +49,8 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mco-test5.tmp mco-test5.po || exit 1
-LC_ALL=C tr -d '\r' < mco-test5.tmp > mco-test5.out || exit 1
+${MSGCONV} --to-code=UTF-8 -o mco-test5.tmp mco-test5.po || Exit 1
+LC_ALL=C tr -d '\r' < mco-test5.tmp > mco-test5.out || Exit 1
 
 cat <<\EOF > mco-test5.ok
 msgid ""
diff --git a/gettext-tools/tests/msgconv-6 b/gettext-tools/tests/msgconv-6
index c4e9844..fbb29bf 100755
--- a/gettext-tools/tests/msgconv-6
+++ b/gettext-tools/tests/msgconv-6
@@ -22,8 +22,8 @@ msgstr "Volle 360 Grad"
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=ISO-8859-1 -o mco-test6.tmp mco-test6.po || exit 1
-LC_ALL=C tr -d '\r' < mco-test6.tmp > mco-test6.out || exit 1
+${MSGCONV} --to-code=ISO-8859-1 -o mco-test6.tmp mco-test6.po || Exit 1
+LC_ALL=C tr -d '\r' < mco-test6.tmp > mco-test6.out || Exit 1
 
 cat <<\EOF > mco-test6.ok
 msgid ""
diff --git a/gettext-tools/tests/msgconv-7 b/gettext-tools/tests/msgconv-7
index 2d1fa65..f07cc54 100755
--- a/gettext-tools/tests/msgconv-7
+++ b/gettext-tools/tests/msgconv-7
@@ -19,7 +19,7 @@ EOF
 
 : ${MSGCONV=msgconv}
 ${MSGCONV} --add-location=file --to-code=UTF-8 \
-           -o mco-test7.out mco-test7.po || exit 1
+           -o mco-test7.out mco-test7.po || Exit 1
 
 cat <<\EOF > mco-test7.ok
 # Chinese translation for GNU gettext messages.
diff --git a/gettext-tools/tests/msgen-1 b/gettext-tools/tests/msgen-1
index 9b02ffa..893c8cd 100755
--- a/gettext-tools/tests/msgen-1
+++ b/gettext-tools/tests/msgen-1
@@ -27,8 +27,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGEN=msgen}
-${MSGEN} -o men-test1.tmp men-test1.po || exit 1
-LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || exit 1
+${MSGEN} -o men-test1.tmp men-test1.po || Exit 1
+LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || Exit 1
 
 cat <<EOF > men-test1.ok
 # HEADER.
@@ -59,9 +59,9 @@ result=$?
 test $result = 0 || exit $result
 
 # Test --lang option.
-${MSGEN} --lang=fr -o men-test1.tmp men-test1.po || exit 1
-grep "Language: fr" men-test1.tmp 2>&1 >/dev/null || exit 1
-grep -v "Language: fr" men-test1.tmp | LC_ALL=C tr -d '\r' > men-test1.out || exit 1
+${MSGEN} --lang=fr -o men-test1.tmp men-test1.po || Exit 1
+grep "Language: fr" men-test1.tmp 2>&1 >/dev/null || Exit 1
+grep -v "Language: fr" men-test1.tmp | LC_ALL=C tr -d '\r' > men-test1.out || Exit 1
 
 ${DIFF} men-test1.ok men-test1.out
 result=$?
diff --git a/gettext-tools/tests/msgen-2 b/gettext-tools/tests/msgen-2
index 170ebd7..b910869 100755
--- a/gettext-tools/tests/msgen-2
+++ b/gettext-tools/tests/msgen-2
@@ -12,8 +12,8 @@ width\ must\ be\ positive=
 EOF
 
 : ${MSGEN=msgen}
-${MSGEN} --properties-input --properties-output -o men-test2.tmp men-test2.properties || exit 1
-LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out || exit 1
+${MSGEN} --properties-input --properties-output -o men-test2.tmp men-test2.properties || Exit 1
+LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out || Exit 1
 
 cat <<\EOF > men-test2.ok
 height\ must\ be\ positive=height must be positive
diff --git a/gettext-tools/tests/msgen-3 b/gettext-tools/tests/msgen-3
index 2b09c1d..9db7e67 100755
--- a/gettext-tools/tests/msgen-3
+++ b/gettext-tools/tests/msgen-3
@@ -41,8 +41,8 @@ msgstr ""
 EOF
 
 : ${MSGEN=msgen}
-${MSGEN} -o men-test3.tmp men-test3.pot || exit 1
-LC_ALL=C tr -d '\r' < men-test3.tmp > men-test3.out || exit 1
+${MSGEN} -o men-test3.tmp men-test3.pot || Exit 1
+LC_ALL=C tr -d '\r' < men-test3.tmp > men-test3.out || Exit 1
 
 cat <<\EOF > men-test3.ok
 msgid ""
diff --git a/gettext-tools/tests/msgen-4 b/gettext-tools/tests/msgen-4
index 6dddf5d..4867e9b 100755
--- a/gettext-tools/tests/msgen-4
+++ b/gettext-tools/tests/msgen-4
@@ -31,8 +31,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGEN=msgen}
-${MSGEN} --add-location=file -o men-test1.tmp men-test1.po || exit 1
-LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || exit 1
+${MSGEN} --add-location=file -o men-test1.tmp men-test1.po || Exit 1
+LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || Exit 1
 
 cat <<EOF > men-test1.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgexec-1 b/gettext-tools/tests/msgexec-1
index e9094fc..05c0445 100755
--- a/gettext-tools/tests/msgexec-1
+++ b/gettext-tools/tests/msgexec-1
@@ -72,7 +72,7 @@ LC_ALL=C \
 ${MSGEXEC} -i mex-test1.po ./mex-test1.sh > mex-test1.out 2> mex-test1.err
 result=$?
 cat mex-test1.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mex-test1.ok
 ========================= mex-test1.po:4 =========================
diff --git a/gettext-tools/tests/msgexec-2 b/gettext-tools/tests/msgexec-2
index fcdb078..02f4218 100755
--- a/gettext-tools/tests/msgexec-2
+++ b/gettext-tools/tests/msgexec-2
@@ -71,8 +71,8 @@ LC_ALL=C \
 ${MSGEXEC} -i mex-test2.po 0 > mex-test2.tmp 2> mex-test2.err
 result=$?
 cat mex-test2.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out || Exit 1
 
 : ${CMP=cmp}
 ${CMP} "$abs_srcdir"/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
diff --git a/gettext-tools/tests/msgexec-3 b/gettext-tools/tests/msgexec-3
index 7955d63..4dff887 100755
--- a/gettext-tools/tests/msgexec-3
+++ b/gettext-tools/tests/msgexec-3
@@ -43,7 +43,7 @@ EOF
 chmod a+x mex-test3.sh
 
 : ${MSGEXEC=msgexec}
-${MSGEXEC} --properties-input -i mex-test3.properties ./mex-test3.sh > mex-test3.out || exit 1
+${MSGEXEC} --properties-input -i mex-test3.properties ./mex-test3.sh > mex-test3.out || Exit 1
 
 cat <<\EOF > mex-test3.ok
 ========================= mex-test3.properties:3 =========================
diff --git a/gettext-tools/tests/msgexec-4 b/gettext-tools/tests/msgexec-4
index e786322..4fe0978 100755
--- a/gettext-tools/tests/msgexec-4
+++ b/gettext-tools/tests/msgexec-4
@@ -82,7 +82,7 @@ LC_ALL=C \
 ${MSGEXEC} -i mex-test4.po ./mex-test4.sh > mex-test4.out 2> mex-test4.err
 result=$?
 cat mex-test4.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mex-test4.ok
 ========================= mex-test4.po:2 =========================
diff --git a/gettext-tools/tests/msgexec-5 b/gettext-tools/tests/msgexec-5
index a2c13cd..b83a6aa 100755
--- a/gettext-tools/tests/msgexec-5
+++ b/gettext-tools/tests/msgexec-5
@@ -53,7 +53,7 @@ LC_ALL=C \
 ${MSGEXEC} -i mex-test5.po ./mex-test5.sh > mex-test5.out 2> mex-test5.err
 result=$?
 cat mex-test5.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mex-test5.ok
 ========================= mex-test5.po:2 =========================
diff --git a/gettext-tools/tests/msgexec-6 b/gettext-tools/tests/msgexec-6
index acea8bc..0edccf9 100755
--- a/gettext-tools/tests/msgexec-6
+++ b/gettext-tools/tests/msgexec-6
@@ -72,7 +72,7 @@ LC_ALL=C \
 ${MSGEXEC} --newline -i mex-test6.po ./mex-test6.sh > mex-test6.out 2> mex-test6.err
 result=$?
 cat mex-test6.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mex-test6.ok
 ========================= mex-test6.po:4 =========================
diff --git a/gettext-tools/tests/msgfilter-1 b/gettext-tools/tests/msgfilter-1
index c1569a0..ef3820d 100755
--- a/gettext-tools/tests/msgfilter-1
+++ b/gettext-tools/tests/msgfilter-1
@@ -19,13 +19,13 @@ fi
 # spaces.
 echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   echo "Skipping test: fold program not POSIX compliant"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping.
 echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || {
   echo "Skipping test: fold program trims trailing spaces"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
@@ -34,7 +34,7 @@ foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
 test "$foldoutputcount" = 3 || {
   echo "Skipping test: fold program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test1.po
@@ -92,7 +92,7 @@ LC_ALL=C \
 ${MSGFILTER} -i mfi-test1.po -o mfi-test1.out fold -b -s -w 20 >mfi-test1.err 2>&1
 result=$?
 cat mfi-test1.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test1.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-2 b/gettext-tools/tests/msgfilter-2
index 036cb87..718dc10 100755
--- a/gettext-tools/tests/msgfilter-2
+++ b/gettext-tools/tests/msgfilter-2
@@ -20,7 +20,7 @@ fi
 sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/`
 test -n "$sedoutput" || {
   echo "Skipping test: sed program is broken"
-  exit 77
+  Exit 77
 }
 
 # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it
@@ -29,7 +29,7 @@ sedoutputcount=`echo $ac_n "abc$ac_c" | sed -e s/x/x/ | wc -c`
 sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ 	]//g'`
 test "$sedoutputcount" = 3 || {
   echo "Skipping test: sed program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test2.po
@@ -93,7 +93,7 @@ LC_ALL=C \
 ${MSGFILTER} -i mfi-test2.po -o mfi-test2.out sed -e "$sedexpr1" -e "$sedexpr2" >mfi-test2.err 2>&1
 result=$?
 cat mfi-test2.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test2.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-3 b/gettext-tools/tests/msgfilter-3
index 02e74ec..7e76657 100755
--- a/gettext-tools/tests/msgfilter-3
+++ b/gettext-tools/tests/msgfilter-3
@@ -19,13 +19,13 @@ fi
 # spaces.
 echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   echo "Skipping test: fold program not POSIX compliant"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping.
 echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || {
   echo "Skipping test: fold program trims trailing spaces"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
@@ -34,7 +34,7 @@ foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
 test "$foldoutputcount" = 3 || {
   echo "Skipping test: fold program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test3.properties
@@ -67,7 +67,7 @@ EOF
 LC_ALL=C \
 ${MSGFILTER} --properties-input --properties-output -i mfi-test3.properties -o mfi-test3.out fold -b -s -w 20
 result=$?
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test3.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-4 b/gettext-tools/tests/msgfilter-4
index 6c9feee..6760b0f 100755
--- a/gettext-tools/tests/msgfilter-4
+++ b/gettext-tools/tests/msgfilter-4
@@ -20,7 +20,7 @@ fi
 sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/`
 test -n "$sedoutput" || {
   echo "Skipping test: sed program is broken"
-  exit 77
+  Exit 77
 }
 
 # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it
@@ -29,7 +29,7 @@ sedoutputcount=`echo $ac_n "abc$ac_c" | sed -e s/x/x/ | wc -c`
 sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ 	]//g'`
 test "$sedoutputcount" = 3 || {
   echo "Skipping test: sed program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test4.po
@@ -88,7 +88,7 @@ LC_ALL=C \
 ${MSGFILTER} -i mfi-test4.po -o mfi-test4.out sed -e "$sedexpr1" -e "$sedexpr2" >mfi-test4.err 2>&1
 result=$?
 cat mfi-test4.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test4.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfilter-5 b/gettext-tools/tests/msgfilter-5
index 0a8da6f..21f08ee 100755
--- a/gettext-tools/tests/msgfilter-5
+++ b/gettext-tools/tests/msgfilter-5
@@ -19,13 +19,13 @@ fi
 # spaces.
 echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   echo "Skipping test: fold program not POSIX compliant"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping.
 echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || {
   echo "Skipping test: fold program trims trailing spaces"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
@@ -34,7 +34,7 @@ foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
 test "$foldoutputcount" = 3 || {
   echo "Skipping test: fold program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test5.po
@@ -92,7 +92,7 @@ LC_ALL=C ${MSGFILTER} --add-location=file -i mfi-test5.po -o mfi-test5.out \
       fold -b -s -w 20 >mfi-test5.err 2>&1
 result=$?
 cat mfi-test5.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test5.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-6 b/gettext-tools/tests/msgfilter-6
index ddf7869..357dd45 100755
--- a/gettext-tools/tests/msgfilter-6
+++ b/gettext-tools/tests/msgfilter-6
@@ -53,7 +53,7 @@ ${MSGFILTER} -i mf-test6.po ./mf-test6.sh >/dev/null 2> mf-test6.err
 result=$?
 
 cat mf-test6.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 LC_ALL=C tr -d '\r' < mf-test6.tmp > mf-test6.out
 
diff --git a/gettext-tools/tests/msgfilter-7 b/gettext-tools/tests/msgfilter-7
index 791441b..8655c18 100755
--- a/gettext-tools/tests/msgfilter-7
+++ b/gettext-tools/tests/msgfilter-7
@@ -69,7 +69,7 @@ LC_ALL=C ${MSGFILTER} -i mfi-test7.po -o mfi-test7.out \
       ./mf-test7.sh >mfi-test7.err 2>&1
 result=$?
 cat mfi-test7.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test7.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-8 b/gettext-tools/tests/msgfilter-8
index 3ffcb5e..f7b7b27 100755
--- a/gettext-tools/tests/msgfilter-8
+++ b/gettext-tools/tests/msgfilter-8
@@ -81,9 +81,9 @@ LC_ALL=C ${MSGFILTER} --newline -i mfi-test8.po -o mfi-test8.out \
       ${CONFIG_SHELL} filter.sh >mfi-test8.err 2>&1
 result=$?
 cat mfi-test8.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 cat mfi-test8.err | grep 'msgfilter: filter output is not terminated with a newline' >/dev/null
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test8.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-quote-1 b/gettext-tools/tests/msgfilter-quote-1
index 28b429a..6dcb364 100755
--- a/gettext-tools/tests/msgfilter-quote-1
+++ b/gettext-tools/tests/msgfilter-quote-1
@@ -76,7 +76,7 @@ msgstr "``double grave'"
 EOF
 
 : ${MSGFILTER=msgfilter}
-LC_ALL=C ${MSGFILTER} -i mfi.po -o mfi-quot.out quot 2>&1 2>/dev/null || exit 1
+LC_ALL=C ${MSGFILTER} -i mfi.po -o mfi-quot.out quot 2>&1 2>/dev/null || Exit 1
 
 cat <<\EOF > mfi-quot.ok
 msgid ""
@@ -151,9 +151,9 @@ msgstr "`‘double grave’"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mfi-quot.ok mfi-quot.out || exit 1
+${DIFF} mfi-quot.ok mfi-quot.out || Exit 1
 
-LC_ALL=C ${MSGFILTER} -i mfi.po -o mfi-boldquot.out boldquot 2>&1 2>/dev/null || exit 1
+LC_ALL=C ${MSGFILTER} -i mfi.po -o mfi-boldquot.out boldquot 2>&1 2>/dev/null || Exit 1
 
 cat <<\EOF > mfi-boldquot.ok
 msgid ""
@@ -227,4 +227,4 @@ msgid "``double grave'"
 msgstr "`‘double grave’"
 EOF
 
-${DIFF} mfi-boldquot.ok mfi-boldquot.out || exit 1
+${DIFF} mfi-boldquot.ok mfi-boldquot.out || Exit 1
diff --git a/gettext-tools/tests/msgfilter-sr-latin-1 b/gettext-tools/tests/msgfilter-sr-latin-1
index 2999a62..c1cc978 100755
--- a/gettext-tools/tests/msgfilter-sr-latin-1
+++ b/gettext-tools/tests/msgfilter-sr-latin-1
@@ -309,12 +309,12 @@ EOF
 # of here documents in /bin/sh is too buggy. Skip the test in this case.
 head -n 1 mfi-srl-1.po | grep Serbian > /dev/null || {
   echo "Skipping test: /bin/sh is too buggy"
-  exit 77
+  Exit 77
 }
 
 : ${MSGFILTER=msgfilter}
-${MSGFILTER} -i mfi-srl-1.po -o mfi-srl-1.tmp recode-sr-latin || exit 1
-LC_ALL=C tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out || exit 1
+${MSGFILTER} -i mfi-srl-1.po -o mfi-srl-1.tmp recode-sr-latin || Exit 1
+LC_ALL=C tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out || Exit 1
 
 cat <<\EOF > mfi-srl-1.ok
 # Serbian translation of gettext-runtime
diff --git a/gettext-tools/tests/msgfmt-1 b/gettext-tools/tests/msgfmt-1
index fd3981d..9bed6af 100755
--- a/gettext-tools/tests/msgfmt-1
+++ b/gettext-tools/tests/msgfmt-1
@@ -44,13 +44,13 @@ EOF
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
 if ${MSGFMT} -o mf-1/LC_MESSAGES/gen.mo mf-1-module1.po mf-1-module2.po 2> /dev/null; then
-  exit 1
+  Exit 1
 fi
 
 # With msgcat, it should work.
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --use-first -o mf-1-modules.po mf-1-module1.po mf-1-module2.po || exit 1
-${MSGFMT} -o mf-1/LC_MESSAGES/gen.mo mf-1-modules.po || exit 1
+${MSGCAT} --use-first -o mf-1-modules.po mf-1-module1.po mf-1-module2.po || Exit 1
+${MSGFMT} -o mf-1/LC_MESSAGES/gen.mo mf-1-modules.po || Exit 1
 
 : ${GETTEXT=gettext}
 TEXTDOMAINDIR=. LANGUAGE=mf-1 \
diff --git a/gettext-tools/tests/msgfmt-10 b/gettext-tools/tests/msgfmt-10
index d747cf8..8b38f19 100755
--- a/gettext-tools/tests/msgfmt-10
+++ b/gettext-tools/tests/msgfmt-10
@@ -36,7 +36,7 @@ msgstr[1] "%d yararsýz kurals"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-test10.po1 || exit 1
+${MSGFMT} --check -o /dev/null mf-test10.po1 || Exit 1
 
 cat <<\EOF > mf-test10.po2
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgfmt-12 b/gettext-tools/tests/msgfmt-12
index f3d1f38..19f9383 100755
--- a/gettext-tools/tests/msgfmt-12
+++ b/gettext-tools/tests/msgfmt-12
@@ -20,11 +20,11 @@ msgstr "<PRIXFAST16> Fehler"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mf-12.mo mf-12.po || exit 1
+${MSGFMT} -o mf-12.mo mf-12.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mf-12.tmp mf-12.mo || exit 1
-LC_ALL=C tr -d '\r' < mf-12.tmp > mf-12.out || exit 1
+${MSGUNFMT} -o mf-12.tmp mf-12.mo || Exit 1
+LC_ALL=C tr -d '\r' < mf-12.tmp > mf-12.out || Exit 1
 
 cat <<\EOF > mf-12.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfmt-14 b/gettext-tools/tests/msgfmt-14
index 3a44ac7..9e30ffe 100755
--- a/gettext-tools/tests/msgfmt-14
+++ b/gettext-tools/tests/msgfmt-14
@@ -49,11 +49,11 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mf-14.mo mf-14.po || exit 1
+${MSGFMT} -o mf-14.mo mf-14.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mf-14.tmp mf-14.mo || exit 1
-LC_ALL=C tr -d '\r' < mf-14.tmp > mf-14.out || exit 1
+${MSGUNFMT} -o mf-14.tmp mf-14.mo || Exit 1
+LC_ALL=C tr -d '\r' < mf-14.tmp > mf-14.out || Exit 1
 
 cat <<\EOF > mf-14.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfmt-15 b/gettext-tools/tests/msgfmt-15
index 5ff7c4b..ba5d516 100755
--- a/gettext-tools/tests/msgfmt-15
+++ b/gettext-tools/tests/msgfmt-15
@@ -37,7 +37,7 @@ msgstr[2] "%d der unnützen Nichtterminale"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-15.po1 || exit 1
+${MSGFMT} --check -o /dev/null mf-15.po1 || Exit 1
 
 cat <<\EOF > mf-15.po2
 # SOME DESCRIPTIVE TITLE.
@@ -67,7 +67,7 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-15.po2 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 cat <<\EOF > mf-15.po3
 # SOME DESCRIPTIVE TITLE.
@@ -96,7 +96,7 @@ msgstr[2] "%d der unnützen Nichtterminale"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-15.po3 || exit 1
+${MSGFMT} --check -o /dev/null mf-15.po3 || Exit 1
 
 cat <<\EOF > mf-15.po4
 # SOME DESCRIPTIVE TITLE.
@@ -126,6 +126,6 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-15.po4 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 exit $result
diff --git a/gettext-tools/tests/msgfmt-16 b/gettext-tools/tests/msgfmt-16
index f2641f5..f5d9fca 100755
--- a/gettext-tools/tests/msgfmt-16
+++ b/gettext-tools/tests/msgfmt-16
@@ -42,11 +42,11 @@ msgstr "Argumente fehlen."
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mf-16.mo mf-16.po || exit 1
+${MSGFMT} -o mf-16.mo mf-16.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mf-16.tmp mf-16.mo || exit 1
-LC_ALL=C tr -d '\r' < mf-16.tmp > mf-16.out || exit 1
+${MSGUNFMT} -o mf-16.tmp mf-16.mo || Exit 1
+LC_ALL=C tr -d '\r' < mf-16.tmp > mf-16.out || Exit 1
 
 cat <<\EOF > mf-16.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfmt-17 b/gettext-tools/tests/msgfmt-17
index cc98b96..8624d7e 100755
--- a/gettext-tools/tests/msgfmt-17
+++ b/gettext-tools/tests/msgfmt-17
@@ -37,7 +37,7 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-17.po1 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 cat <<\EOF > mf-17.po2
 # SOME DESCRIPTIVE TITLE.
@@ -66,7 +66,7 @@ msgstr[2] "ча� и %(number)s четвертей"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-17.po2 || exit 1
+${MSGFMT} --check -o /dev/null mf-17.po2 || Exit 1
 
 cat <<\EOF > mf-17.po3
 # SOME DESCRIPTIVE TITLE.
@@ -96,7 +96,7 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-17.po3 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 cat <<\EOF > mf-17.po4
 # SOME DESCRIPTIVE TITLE.
@@ -126,6 +126,6 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-17.po4 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 exit $result
diff --git a/gettext-tools/tests/msgfmt-18 b/gettext-tools/tests/msgfmt-18
index 3136ce8..cbc8976 100755
--- a/gettext-tools/tests/msgfmt-18
+++ b/gettext-tools/tests/msgfmt-18
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check-accelerators -o /dev/null mf-18.po 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check-accelerators='_' -o /dev/null mf-18.po 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
diff --git a/gettext-tools/tests/msgfmt-2 b/gettext-tools/tests/msgfmt-2
index 4a24487..4f52797 100755
--- a/gettext-tools/tests/msgfmt-2
+++ b/gettext-tools/tests/msgfmt-2
@@ -56,13 +56,13 @@ EOF
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
 if ${MSGFMT} -o mf-2/LC_MESSAGES/gen.mo mf-2-module1.po mf-2-module2.po 2> /dev/null; then
-  exit 1
+  Exit 1
 fi
 
 # With msgcat, it should work.
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --use-first -o mf-2-modules.po mf-2-module1.po mf-2-module2.po || exit 1
-${MSGFMT} -o mf-2/LC_MESSAGES/gen.mo mf-2-modules.po || exit 1
+${MSGCAT} --use-first -o mf-2-modules.po mf-2-module1.po mf-2-module2.po || Exit 1
+${MSGFMT} -o mf-2/LC_MESSAGES/gen.mo mf-2-modules.po || Exit 1
 
 : ${GETTEXT=gettext}
 TEXTDOMAINDIR=. LANGUAGE=mf-2 \
diff --git a/gettext-tools/tests/msgfmt-3 b/gettext-tools/tests/msgfmt-3
index a46f88f..aab90b8 100755
--- a/gettext-tools/tests/msgfmt-3
+++ b/gettext-tools/tests/msgfmt-3
@@ -22,7 +22,7 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} -o mftest3.mo mf-test3.po >mftest3.err 2>&1
 result=$?
 cat mftest3.err | grep -v 'warning: Charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 test ! -f mftest3.mo
 result=$?
diff --git a/gettext-tools/tests/msgfmt-5 b/gettext-tools/tests/msgfmt-5
index f4fb368..2820ebc 100755
--- a/gettext-tools/tests/msgfmt-5
+++ b/gettext-tools/tests/msgfmt-5
@@ -30,13 +30,13 @@ msgstr "A bientôt"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} foo.po || exit 1
+${MSGFMT} foo.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o foo-de.tmp foo-de.mo || exit 1
-LC_ALL=C tr -d '\r' < foo-de.tmp > foo-de.out || exit 1
-${MSGUNFMT} -o foo-fr.tmp foo-fr.mo || exit 1
-LC_ALL=C tr -d '\r' < foo-fr.tmp > foo-fr.out || exit 1
+${MSGUNFMT} -o foo-de.tmp foo-de.mo || Exit 1
+LC_ALL=C tr -d '\r' < foo-de.tmp > foo-de.out || Exit 1
+${MSGUNFMT} -o foo-fr.tmp foo-fr.mo || Exit 1
+LC_ALL=C tr -d '\r' < foo-fr.tmp > foo-fr.out || Exit 1
 
 cat <<\EOF > foo-de.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfmt-desktop-1 b/gettext-tools/tests/msgfmt-desktop-1
index 18ca696..493c085 100755
--- a/gettext-tools/tests/msgfmt-desktop-1
+++ b/gettext-tools/tests/msgfmt-desktop-1
@@ -67,16 +67,16 @@ EOF
 
 ${MSGFMT} --desktop --template=mf.desktop -l fr fr.po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --desktop --template=mf.desktop fr.po -o mf.desktop.out \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 # Proceed to the .desktop file generation.
 
 ${MSGFMT} --desktop --template=mf.desktop -l fr fr.po -o mf.desktop.out \
-  || exit 1
+  || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.desktop.ok mf.desktop.out
diff --git a/gettext-tools/tests/msgfmt-desktop-2 b/gettext-tools/tests/msgfmt-desktop-2
index 5fbb75a..3a40b85 100755
--- a/gettext-tools/tests/msgfmt-desktop-2
+++ b/gettext-tools/tests/msgfmt-desktop-2
@@ -131,13 +131,13 @@ unset LINGUAS
 
 ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out \
           >/dev/null 2>/dev/null \
-  exit 1
+  Exit 1
 
 test -d po/LINGUAS || mkdir po/LINGUAS
 
 ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out \
           >/dev/null 2>/dev/null \
-  exit 1
+  Exit 1
 
 rm -fr po/LINGUAS
 
@@ -148,28 +148,28 @@ EOF
 
 ${MSGFMT} --desktop --template=mf.desktop -d po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --desktop --template=mf.desktop -d po -o mf.desktop.out -l fr \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --desktop --template=mf.desktop -d po -o mf.desktop.out po/fr.po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 # Proceed to the .desktop file generation.
 
-${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out || exit 1
+${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.desktop.ok mf.desktop.out
-test $? = 0 || exit 1
+test $? = 0 || Exit 1
 
 # Restrict the desired languages with the LINGUAS envvar.
 
-LINGUAS="fr ja" ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.desired.out || exit 1
+LINGUAS="fr ja" ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.desired.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.desktop.desired.ok mf.desktop.desired.out
-test $? = 0 || exit 1
+test $? = 0 || Exit 1
diff --git a/gettext-tools/tests/msgfmt-properties-1 b/gettext-tools/tests/msgfmt-properties-1
index 8851cc9..fab406d 100755
--- a/gettext-tools/tests/msgfmt-properties-1
+++ b/gettext-tools/tests/msgfmt-properties-1
@@ -24,13 +24,13 @@ EOF
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
 if ${MSGFMT} --properties-input -o mf-p-1/LC_MESSAGES/gen.mo mf-p-1-1.properties mf-p-1-2.properties 2> /dev/null; then
-  exit 1
+  Exit 1
 fi
 
 # With msgcat, it should work.
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --properties-input --properties-output --use-first -o mf-p-1-s.properties mf-p-1-1.properties mf-p-1-2.properties || exit 1
-${MSGFMT} --properties-input -o mf-p-1/LC_MESSAGES/gen.mo mf-p-1-s.properties || exit 1
+${MSGCAT} --properties-input --properties-output --use-first -o mf-p-1-s.properties mf-p-1-1.properties mf-p-1-2.properties || Exit 1
+${MSGFMT} --properties-input -o mf-p-1/LC_MESSAGES/gen.mo mf-p-1-s.properties || Exit 1
 
 : ${GETTEXT=gettext}
 TEXTDOMAINDIR=. LANGUAGE=mf-p-1 \
diff --git a/gettext-tools/tests/msgfmt-qt-1 b/gettext-tools/tests/msgfmt-qt-1
index f5dff9d..0308580 100755
--- a/gettext-tools/tests/msgfmt-qt-1
+++ b/gettext-tools/tests/msgfmt-qt-1
@@ -4,7 +4,7 @@
 # Test output in Qt .qm format.
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt -o mf-qt-1.qm "$abs_srcdir"/qttest_pl.po || exit 1
+${MSGFMT} --qt -o mf-qt-1.qm "$abs_srcdir"/qttest_pl.po || Exit 1
 
 : ${CMP=cmp}
 ${CMP} "$abs_srcdir"/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
diff --git a/gettext-tools/tests/msgfmt-qt-2 b/gettext-tools/tests/msgfmt-qt-2
index 99cf145..482ef19 100755
--- a/gettext-tools/tests/msgfmt-qt-2
+++ b/gettext-tools/tests/msgfmt-qt-2
@@ -4,7 +4,7 @@
 # Test msgfmt --qt on a PO file with contexts.
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt "$abs_srcdir"/qttest2_de.po -o mf-qt-2.qm || exit 1
+${MSGFMT} --qt "$abs_srcdir"/qttest2_de.po -o mf-qt-2.qm || Exit 1
 
 : ${CMP=cmp}
 ${CMP} "$abs_srcdir"/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null
diff --git a/gettext-tools/tests/msgfmt-xml-1 b/gettext-tools/tests/msgfmt-xml-1
index 40e956b..32003fa 100755
--- a/gettext-tools/tests/msgfmt-xml-1
+++ b/gettext-tools/tests/msgfmt-xml-1
@@ -92,16 +92,16 @@ EOF
 
 ${MSGFMT} --xml --template=mf.appdata.xml -l fr fr.po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --xml --template=mf.appdata.xml fr.po -o mf.appdata.xml.out \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 # Proceed to the XML file generation.
 
 ${MSGFMT} --xml --template=mf.appdata.xml -l fr fr.po -o mf.appdata.xml.out \
-  || exit 1
+  || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.appdata.xml.ok mf.appdata.xml.out
@@ -111,7 +111,7 @@ test $result = 0 || exit $result
 # Test -L option.
 cp mf.appdata.xml mf.xml
 ${MSGFMT} --xml --template=mf.xml -L AppData -l fr fr.po -o mf.appdata.xml.out \
-  || exit 1
+  || Exit 1
 ${DIFF} mf.appdata.xml.ok mf.appdata.xml.out
 result=$?
 test $result = 0 || exit $result
diff --git a/gettext-tools/tests/msgfmt-xml-2 b/gettext-tools/tests/msgfmt-xml-2
index d10d21c..e41a6c0 100755
--- a/gettext-tools/tests/msgfmt-xml-2
+++ b/gettext-tools/tests/msgfmt-xml-2
@@ -160,13 +160,13 @@ unset LINGUAS
 
 ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out \
           >/dev/null 2>/dev/null \
-  exit 1
+  Exit 1
 
 test -d po/LINGUAS || mkdir po/LINGUAS
 
 ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out \
           >/dev/null 2>/dev/null \
-  exit 1
+  Exit 1
 
 rm -fr po/LINGUAS
 
@@ -177,27 +177,27 @@ EOF
 
 ${MSGFMT} --xml --template=mf.appdata.xml -d po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out -l fr \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out po/fr.po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 # Proceed to the .desktop file generation.
 
-${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out || exit 1
+${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out || Exit 1
 : ${DIFF=diff}
 ${DIFF} mf.appdata.xml.ok mf.appdata.xml.out
-test $? = 0 || exit 1
+test $? = 0 || Exit 1
 
 # Restrict the desired languages with the LINGUAS envvar.
 
-LINGUAS="fr ja" ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.desired.out || exit 1
+LINGUAS="fr ja" ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.desired.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.appdata.xml.desired.ok mf.appdata.xml.desired.out
-test $? = 0 || exit 1
+test $? = 0 || Exit 1
diff --git a/gettext-tools/tests/msggrep-1 b/gettext-tools/tests/msggrep-1
index 33d4181..047f262 100755
--- a/gettext-tools/tests/msggrep-1
+++ b/gettext-tools/tests/msggrep-1
@@ -153,8 +153,8 @@ msgstr "Subprozess %s hat ein fatales Signal erhalten"
 EOF
 
 : ${MSGGREP=msggrep}
-${MSGGREP} -N pipe-bidi.c -o mg-test1.tmp mg-test1.po || exit 1
-LC_ALL=C tr -d '\r' < mg-test1.tmp > mg-test1.out || exit 1
+${MSGGREP} -N pipe-bidi.c -o mg-test1.tmp mg-test1.po || Exit 1
+LC_ALL=C tr -d '\r' < mg-test1.tmp > mg-test1.out || Exit 1
 
 cat <<\EOF > mg-test1.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-10 b/gettext-tools/tests/msggrep-10
index 753220b..1f50cf8 100755
--- a/gettext-tools/tests/msggrep-10
+++ b/gettext-tools/tests/msggrep-10
@@ -6,6 +6,6 @@
 # <https://savannah.gnu.org/bugs/?25437>
 
 : ${MSGGREP=msggrep}
-echo a=b | LC_MESSAGES=C LC_ALL= ${MSGGREP} -P -K -e '^a$' > /dev/null || exit 1
+echo a=b | LC_MESSAGES=C LC_ALL= ${MSGGREP} -P -K -e '^a$' > /dev/null || Exit 1
 
 exit $result
diff --git a/gettext-tools/tests/msggrep-11 b/gettext-tools/tests/msggrep-11
index bf77675..5df1fb0 100755
--- a/gettext-tools/tests/msggrep-11
+++ b/gettext-tools/tests/msggrep-11
@@ -154,8 +154,8 @@ EOF
 
 : ${MSGGREP=msggrep}
 ${MSGGREP} --add-location=file -N pipe-bidi.c -o mg-test11.tmp mg-test11.po \
-    || exit 1
-LC_ALL=C tr -d '\r' < mg-test11.tmp > mg-test11.out || exit 1
+    || Exit 1
+LC_ALL=C tr -d '\r' < mg-test11.tmp > mg-test11.out || Exit 1
 
 cat <<\EOF > mg-test11.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-2 b/gettext-tools/tests/msggrep-2
index 62eafbc..15ad845 100755
--- a/gettext-tools/tests/msggrep-2
+++ b/gettext-tools/tests/msggrep-2
@@ -150,8 +150,8 @@ msgstr "%s: l'option « -W %s » ne tolère pas d'argument\n"
 EOF
 
 : ${MSGGREP=msggrep}
-${MSGGREP} -M fr -o mg-test2.tmp mg-test2.po || exit 1
-LC_ALL=C tr -d '\r' < mg-test2.tmp > mg-test2.out || exit 1
+${MSGGREP} -M fr -o mg-test2.tmp mg-test2.po || Exit 1
+LC_ALL=C tr -d '\r' < mg-test2.tmp > mg-test2.out || Exit 1
 
 cat <<\EOF > mg-test2.ok
 domain "de"
diff --git a/gettext-tools/tests/msggrep-3 b/gettext-tools/tests/msggrep-3
index fbcbf93..86da09f 100755
--- a/gettext-tools/tests/msggrep-3
+++ b/gettext-tools/tests/msggrep-3
@@ -161,8 +161,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -K -e error -T -e Speicher -o mg-test3.tmp mg-test3.po >mg-test3.err 2>&1
 result=$?
 cat mg-test3.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test3.tmp > mg-test3.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test3.tmp > mg-test3.out || Exit 1
 
 cat <<\EOF > mg-test3.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-4 b/gettext-tools/tests/msggrep-4
index b15b51a..f711d81 100755
--- a/gettext-tools/tests/msggrep-4
+++ b/gettext-tools/tests/msggrep-4
@@ -161,8 +161,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot -o mg-test4.tmp mg-test4.po > mg-test4.err 2>&1
 result=$?
 cat mg-test4.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test4.tmp > mg-test4.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test4.tmp > mg-test4.out || Exit 1
 
 cat <<\EOF > mg-test4.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-5 b/gettext-tools/tests/msggrep-5
index 9252f38..4f11e15 100755
--- a/gettext-tools/tests/msggrep-5
+++ b/gettext-tools/tests/msggrep-5
@@ -169,8 +169,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -C -e @proofread -o mg-test5.tmp mg-test5.po >mg-test5.err 2>&1
 result=$?
 cat mg-test5.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test5.tmp > mg-test5.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test5.tmp > mg-test5.out || Exit 1
 
 cat <<\EOF > mg-test5.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-6 b/gettext-tools/tests/msggrep-6
index 20b5310..c428483 100755
--- a/gettext-tools/tests/msggrep-6
+++ b/gettext-tools/tests/msggrep-6
@@ -115,8 +115,8 @@ EOF
 LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} --properties-input --properties-output -K -e error -T -e Speicher -o mg-test6.tmp mg-test6.properties
 result=$?
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test6.tmp > mg-test6.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test6.tmp > mg-test6.out || Exit 1
 
 cat <<\EOF > mg-test6.ok
 #: copy-file.c:60
diff --git a/gettext-tools/tests/msggrep-7 b/gettext-tools/tests/msggrep-7
index 18fcd44..82319ce 100755
--- a/gettext-tools/tests/msggrep-7
+++ b/gettext-tools/tests/msggrep-7
@@ -53,8 +53,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -J -e "File|" -o mg-test7.tmp mg-test7.po 2> mg-test7.err
 result=$?
 cat mg-test7.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test7.tmp > mg-test7.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test7.tmp > mg-test7.out || Exit 1
 
 cat <<\EOF > mg-test7.ok
 msgid ""
diff --git a/gettext-tools/tests/msggrep-8 b/gettext-tools/tests/msggrep-8
index 10f4457..61b8f14 100755
--- a/gettext-tools/tests/msggrep-8
+++ b/gettext-tools/tests/msggrep-8
@@ -37,8 +37,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -X -e c-form -o mg-test8.tmp mg-test8.po >mg-test8.err 2>&1
 result=$?
 cat mg-test8.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test8.tmp > mg-test8.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test8.tmp > mg-test8.out || Exit 1
 
 cat <<\EOF > mg-test8.ok
 msgid ""
diff --git a/gettext-tools/tests/msggrep-9 b/gettext-tools/tests/msggrep-9
index 9be93d3..207f69e 100755
--- a/gettext-tools/tests/msggrep-9
+++ b/gettext-tools/tests/msggrep-9
@@ -159,8 +159,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -K -e 'argument$' -o mg-test9.tmp mg-test9.po > mg-test9.err 2>&1
 result=$?
 cat mg-test9.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test9.tmp > mg-test9.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test9.tmp > mg-test9.out || Exit 1
 
 cat <<\EOF > mg-test9.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msginit-1 b/gettext-tools/tests/msginit-1
index 71754d2..fa42552 100755
--- a/gettext-tools/tests/msginit-1
+++ b/gettext-tools/tests/msginit-1
@@ -39,10 +39,10 @@ EOF
 
 : ${MSGINIT=msginit}
 ${MSGINIT} -i mi-test1.pot -l ga_IE --no-translator -o mi-test1.tmp 2>mi-test1.err
-test $? = 0 || { cat mi-test1.err 1>&2; exit 1; }
+test $? = 0 || { cat mi-test1.err 1>&2; Exit 1; }
 # The charset stored in the header entry is the locale encoding of the gl_IE
 # locale, which is system dependent, or ASCII if the locale does not exist.
-sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test1.tmp | LC_ALL=C tr -d '\r' > mi-test1.out || exit 1
+sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test1.tmp | LC_ALL=C tr -d '\r' > mi-test1.out || Exit 1
 
 cat <<\EOF > mi-test1.ok
 "Last-Translator: Automatically generated\n"
diff --git a/gettext-tools/tests/msginit-2 b/gettext-tools/tests/msginit-2
index bd8c5af..bd3efcd 100755
--- a/gettext-tools/tests/msginit-2
+++ b/gettext-tools/tests/msginit-2
@@ -63,8 +63,8 @@ EOF
 
 : ${MSGINIT=msginit}
 ${MSGINIT} -i mi-test2.pot -l ga_IE --no-translator -o mi-test2.tmp 2>mi-test2.err
-test $? = 0 || { cat mi-test2.err 1>&2; exit 1; }
-sed -e '1,10d' < mi-test2.tmp | LC_ALL=C tr -d '\r' > mi-test2.out || exit 1
+test $? = 0 || { cat mi-test2.err 1>&2; Exit 1; }
+sed -e '1,10d' < mi-test2.tmp | LC_ALL=C tr -d '\r' > mi-test2.out || Exit 1
 
 cat <<\EOF > mi-test2.ok
 "Last-Translator: Automatically generated\n"
diff --git a/gettext-tools/tests/msginit-3 b/gettext-tools/tests/msginit-3
index 923c4cf..ce971ed 100755
--- a/gettext-tools/tests/msginit-3
+++ b/gettext-tools/tests/msginit-3
@@ -38,16 +38,16 @@ EOF
 
 : ${MSGINIT=msginit}
 GETTEXTLIBDIR="$abs_top_srcdir"/src ${MSGINIT} -l ga_IE --no-translator -o mi-test3.tmp 2>mi-test3.err
-test $? = 0 || { cat mi-test3.err 1>&2; exit 1; }
+test $? = 0 || { cat mi-test3.err 1>&2; Exit 1; }
 
-grep "Project-Id-Version: gt-msginit " mi-test3.tmp 2>&1 >/dev/null || exit 1
+grep "Project-Id-Version: gt-msginit " mi-test3.tmp 2>&1 >/dev/null || Exit 1
 
 # The charset stored in the header entry is the locale encoding of the gl_IE
 # locale, which is system dependent, or ASCII if the locale does not exist.
 #
 # Project-Id-Version contains version constructed from a temporary
 # directory name
-sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test3.tmp | grep -v Project-Id-Version | LC_ALL=C tr -d '\r' > mi-test3.out || exit 1
+sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test3.tmp | grep -v Project-Id-Version | LC_ALL=C tr -d '\r' > mi-test3.out || Exit 1
 cat <<\EOF > mi-test3.ok
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
diff --git a/gettext-tools/tests/msginit-4 b/gettext-tools/tests/msginit-4
index 369f152..f4335f1 100755
--- a/gettext-tools/tests/msginit-4
+++ b/gettext-tools/tests/msginit-4
@@ -6,7 +6,7 @@
 LC_ALL=C "$top_builddir/src/cldr-plurals" ru /dev/null 2>&1 | grep 'extraction is not supported' > /dev/null 2>&1
 test $? = 0 && {
   echo "Skipping test: cldr-plurals was built without XML support"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mi-test4.pot
@@ -45,14 +45,14 @@ EOF
 
 : ${MSGINIT=msginit}
 GETTEXTLIBDIR="$top_builddir"/src GETTEXTCLDRDIR="$abs_srcdir" ${MSGINIT} -l foo --no-translator --no-wrap -o mi-test4.tmp 2>mi-test4.err
-test $? = 0 || { cat mi-test4.err 1>&2; exit 1; }
+test $? = 0 || { cat mi-test4.err 1>&2; Exit 1; }
 
 # The charset stored in the header entry is the locale encoding of the gl_IE
 # locale, which is system dependent, or ASCII if the locale does not exist.
 #
 # Project-Id-Version contains version constructed from a temporary
 # directory name
-sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test4.tmp | grep -v Project-Id-Version | LC_ALL=C tr -d '\r' > mi-test4.out || exit 1
+sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test4.tmp | grep -v Project-Id-Version | LC_ALL=C tr -d '\r' > mi-test4.out || Exit 1
 cat <<\EOF > mi-test4.ok
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
diff --git a/gettext-tools/tests/msgmerge-1 b/gettext-tools/tests/msgmerge-1
index dd1f689..141b6be 100755
--- a/gettext-tools/tests/msgmerge-1
+++ b/gettext-tools/tests/msgmerge-1
@@ -36,8 +36,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test1.tmp mm-test1.in1 mm-test1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mm-test1.tmp > mm-test1.out || exit 1
+${MSGMERGE} -q -o mm-test1.tmp mm-test1.in1 mm-test1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mm-test1.tmp > mm-test1.out || Exit 1
 
 cat << EOF > mm-test1.ok
 # first
diff --git a/gettext-tools/tests/msgmerge-10 b/gettext-tools/tests/msgmerge-10
index eb1a429..8081346 100755
--- a/gettext-tools/tests/msgmerge-10
+++ b/gettext-tools/tests/msgmerge-10
@@ -51,8 +51,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test10.tmp mm-test10.po mm-test10.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test10.tmp > mm-test10.out || exit 1
+${MSGMERGE} -q -o mm-test10.tmp mm-test10.po mm-test10.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test10.tmp > mm-test10.out || Exit 1
 
 cat <<EOF > mm-test10.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11
index bb5d757..ed49db9 100755
--- a/gettext-tools/tests/msgmerge-11
+++ b/gettext-tools/tests/msgmerge-11
@@ -53,8 +53,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test11.tmp mm-test11.po mm-test11.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test11.tmp > mm-test11.out || exit 1
+${MSGMERGE} -q -o mm-test11.tmp mm-test11.po mm-test11.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test11.tmp > mm-test11.out || Exit 1
 
 cat <<EOF > mm-test11.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-12 b/gettext-tools/tests/msgmerge-12
index 46c25a6..fb9f52f 100755
--- a/gettext-tools/tests/msgmerge-12
+++ b/gettext-tools/tests/msgmerge-12
@@ -51,8 +51,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test12.tmp mm-test12.po mm-test12.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out || exit 1
+${MSGMERGE} -q -o mm-test12.tmp mm-test12.po mm-test12.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out || Exit 1
 
 cat <<EOF > mm-test12.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-13 b/gettext-tools/tests/msgmerge-13
index 2887698..4eb9a4d 100755
--- a/gettext-tools/tests/msgmerge-13
+++ b/gettext-tools/tests/msgmerge-13
@@ -84,8 +84,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test13.tmp mm-test13.po mm-test13.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out || exit 1
+${MSGMERGE} -q -o mm-test13.tmp mm-test13.po mm-test13.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out || Exit 1
 
 cat <<EOF > mm-test13.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-14 b/gettext-tools/tests/msgmerge-14
index 7c15d2f..1514d8e 100755
--- a/gettext-tools/tests/msgmerge-14
+++ b/gettext-tools/tests/msgmerge-14
@@ -55,8 +55,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test14.tmp mm-test14-ru.po mm-test14.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test14.tmp > mm-test14.out || exit 1
+${MSGMERGE} -q -o mm-test14.tmp mm-test14-ru.po mm-test14.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test14.tmp > mm-test14.out || Exit 1
 
 cat <<\EOF > mm-test14.ok
 # Russian messages for CLISP
diff --git a/gettext-tools/tests/msgmerge-15 b/gettext-tools/tests/msgmerge-15
index a7a80aa..30dca36 100755
--- a/gettext-tools/tests/msgmerge-15
+++ b/gettext-tools/tests/msgmerge-15
@@ -27,8 +27,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test15.tmp mm-test15.pot mm-test15.po || exit 1
-LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.out || exit 1
+${MSGMERGE} -q -o mm-test15.tmp mm-test15.pot mm-test15.po || Exit 1
+LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.out || Exit 1
 
 cat <<\EOF > mm-test15.ok
 msgid ""
diff --git a/gettext-tools/tests/msgmerge-16 b/gettext-tools/tests/msgmerge-16
index ed726c2..cbff312 100755
--- a/gettext-tools/tests/msgmerge-16
+++ b/gettext-tools/tests/msgmerge-16
@@ -57,8 +57,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test16.tmp.po mm-test16.po mm-test16.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po || exit 1
+${MSGMERGE} -q -o mm-test16.tmp.po mm-test16.po mm-test16.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po || Exit 1
 
 cat <<\EOF > mm-test16.ok
 msgid ""
diff --git a/gettext-tools/tests/msgmerge-17 b/gettext-tools/tests/msgmerge-17
index 7342061..6b64fcd 100755
--- a/gettext-tools/tests/msgmerge-17
+++ b/gettext-tools/tests/msgmerge-17
@@ -51,8 +51,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test17.tmp.po mm-test17.po mm-test17.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po || exit 1
+${MSGMERGE} -q -o mm-test17.tmp.po mm-test17.po mm-test17.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po || Exit 1
 
 cat <<\EOF > mm-test17.ok
 # Irish translations.
diff --git a/gettext-tools/tests/msgmerge-18 b/gettext-tools/tests/msgmerge-18
index 6037379..ef0f6d6 100755
--- a/gettext-tools/tests/msgmerge-18
+++ b/gettext-tools/tests/msgmerge-18
@@ -114,11 +114,11 @@ EOF
 
 : ${MSGCMP=msgcmp}
 ${MSGCMP} --use-fuzzy --use-untranslated mm-test18.po mm-test18.pot 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test18.tmp.po mm-test18.po mm-test18.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po || exit 1
+${MSGMERGE} -q -o mm-test18.tmp.po mm-test18.po mm-test18.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po || Exit 1
 
 # Note that the fuzzy guess for "Open" in context "Door state" could be either
 # "Ouvrir" (from context "File|") or "Ouvert" (from context "Lock state").
@@ -186,9 +186,9 @@ msgstr "photocopieur"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test18.ok mm-test18.new.po || exit 1
+${DIFF} mm-test18.ok mm-test18.new.po || Exit 1
 
 : ${MSGCMP=msgcmp}
-${MSGCMP} --use-fuzzy --use-untranslated mm-test18.new.po mm-test18.pot || exit 1
+${MSGCMP} --use-fuzzy --use-untranslated mm-test18.new.po mm-test18.pot || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-19 b/gettext-tools/tests/msgmerge-19
index 740b7ae..9f54dc1 100755
--- a/gettext-tools/tests/msgmerge-19
+++ b/gettext-tools/tests/msgmerge-19
@@ -77,8 +77,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.po mm-test19.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po || exit 1
+${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.po mm-test19.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po || Exit 1
 
 cat <<\EOF > mm-test19.ok1
 msgid ""
@@ -120,7 +120,7 @@ msgstr "%s: ungültige Option -- %c\n"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test19.ok1 mm-test19.new1.po || exit 1
+${DIFF} mm-test19.ok1 mm-test19.new1.po || Exit 1
 
 cat <<\EOF > mm-test19.pot
 # SOME DESCRIPTIVE TITLE.
@@ -161,8 +161,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.new1.po mm-test19.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po || exit 1
+${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.new1.po mm-test19.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po || Exit 1
 
 cat <<\EOF > mm-test19.ok2
 msgid ""
@@ -203,6 +203,6 @@ msgstr "Argumente fehlen"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test19.ok2 mm-test19.new2.po || exit 1
+${DIFF} mm-test19.ok2 mm-test19.new2.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-20 b/gettext-tools/tests/msgmerge-20
index f752fd9..5985fa8 100755
--- a/gettext-tools/tests/msgmerge-20
+++ b/gettext-tools/tests/msgmerge-20
@@ -72,8 +72,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test20.tmp.po mm-test20.po mm-test20.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po || exit 1
+${MSGMERGE} -q -o mm-test20.tmp.po mm-test20.po mm-test20.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po || Exit 1
 
 cat <<\EOF > mm-test20.ok
 msgid ""
@@ -109,6 +109,6 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test20.ok mm-test20.new.po || exit 1
+${DIFF} mm-test20.ok mm-test20.new.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-21 b/gettext-tools/tests/msgmerge-21
index 6e1c6f5..d3c014b 100755
--- a/gettext-tools/tests/msgmerge-21
+++ b/gettext-tools/tests/msgmerge-21
@@ -46,8 +46,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test21.tmp.po mm-test21.po mm-test21.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test21.tmp.po > mm-test21.new.po || exit 1
+${MSGMERGE} -q -o mm-test21.tmp.po mm-test21.po mm-test21.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test21.tmp.po > mm-test21.new.po || Exit 1
 
 cat <<\EOF > mm-test21.ok
 msgid ""
@@ -72,9 +72,9 @@ msgstr[1] "Engadir %n recursos dende o libro de enderezos"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test21.ok mm-test21.new.po || exit 1
+${DIFF} mm-test21.ok mm-test21.new.po || Exit 1
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o mm-test21.mo mm-test21.new.po || exit 1
+${MSGFMT} --check -o mm-test21.mo mm-test21.new.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-22 b/gettext-tools/tests/msgmerge-22
index b0882d7..ffda11d 100755
--- a/gettext-tools/tests/msgmerge-22
+++ b/gettext-tools/tests/msgmerge-22
@@ -44,8 +44,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test22.tmp.po mm-test22.po mm-test22.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test22.tmp.po > mm-test22.new.po || exit 1
+${MSGMERGE} -q -o mm-test22.tmp.po mm-test22.po mm-test22.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test22.tmp.po > mm-test22.new.po || Exit 1
 
 cat <<\EOF > mm-test22.ok
 msgid ""
@@ -70,9 +70,9 @@ msgstr[1] "Engadir %n recursos dende o libro de enderezos"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test22.ok mm-test22.new.po || exit 1
+${DIFF} mm-test22.ok mm-test22.new.po || Exit 1
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o mm-test22.mo mm-test22.new.po || exit 1
+${MSGFMT} --check -o mm-test22.mo mm-test22.new.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-23 b/gettext-tools/tests/msgmerge-23
index 757e190..125cdfe 100755
--- a/gettext-tools/tests/msgmerge-23
+++ b/gettext-tools/tests/msgmerge-23
@@ -77,8 +77,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test23.tmp.po mm-test23.po mm-test23.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test23.tmp.po > mm-test23.new.po || exit 1
+${MSGMERGE} -q --previous -o mm-test23.tmp.po mm-test23.po mm-test23.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test23.tmp.po > mm-test23.new.po || Exit 1
 
 cat <<\EOF > mm-test23.ok
 msgid ""
@@ -120,9 +120,9 @@ msgstr[1] "%n Bände"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test23.ok mm-test23.new.po || exit 1
+${DIFF} mm-test23.ok mm-test23.new.po || Exit 1
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o mm-test23.mo mm-test23.new.po || exit 1
+${MSGFMT} --check -o mm-test23.mo mm-test23.new.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-24 b/gettext-tools/tests/msgmerge-24
index a919147..42b6d6f 100755
--- a/gettext-tools/tests/msgmerge-24
+++ b/gettext-tools/tests/msgmerge-24
@@ -102,11 +102,11 @@ msgstr[1] ""
 EOF
 
 : ${MSGCMP=msgcmp}
-${MSGCMP} --use-fuzzy --use-untranslated mm-test24.po mm-test24.pot 2>/dev/null || exit 1
+${MSGCMP} --use-fuzzy --use-untranslated mm-test24.po mm-test24.pot 2>/dev/null || Exit 1
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test24.tmp.po mm-test24.po mm-test24.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test24.tmp.po > mm-test24.new.po || exit 1
+${MSGMERGE} -q -o mm-test24.tmp.po mm-test24.po mm-test24.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test24.tmp.po > mm-test24.new.po || Exit 1
 
 cat <<\EOF > mm-test24.ok
 msgid ""
@@ -153,9 +153,9 @@ msgstr[1] "cinq semaines et %d jours"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test24.ok mm-test24.new.po || exit 1
+${DIFF} mm-test24.ok mm-test24.new.po || Exit 1
 
 : ${MSGCMP=msgcmp}
-${MSGCMP} --use-fuzzy --use-untranslated mm-test24.new.po mm-test24.pot || exit 1
+${MSGCMP} --use-fuzzy --use-untranslated mm-test24.new.po mm-test24.pot || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-25 b/gettext-tools/tests/msgmerge-25
index d0f2d2c..af76b48 100755
--- a/gettext-tools/tests/msgmerge-25
+++ b/gettext-tools/tests/msgmerge-25
@@ -37,8 +37,8 @@ EOF
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} --add-location=file -q -o mm-test25.tmp mm-test25.in1 mm-test25.in2 \
-    || exit 1
-LC_ALL=C tr -d '\r' < mm-test25.tmp > mm-test25.out || exit 1
+    || Exit 1
+LC_ALL=C tr -d '\r' < mm-test25.tmp > mm-test25.out || Exit 1
 
 cat << EOF > mm-test25.ok
 # first
diff --git a/gettext-tools/tests/msgmerge-3 b/gettext-tools/tests/msgmerge-3
index b03d47e..3c092ed 100755
--- a/gettext-tools/tests/msgmerge-3
+++ b/gettext-tools/tests/msgmerge-3
@@ -50,8 +50,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test3.tmp mm-test3.in1 mm-test3.in2 || exit 1
-LC_ALL=C tr -d '\r' < mm-test3.tmp > mm-test3.out || exit 1
+${MSGMERGE} -q -o mm-test3.tmp mm-test3.in1 mm-test3.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mm-test3.tmp > mm-test3.out || Exit 1
 
 cat << EOF > mm-test3.ok
 #: file3:102
diff --git a/gettext-tools/tests/msgmerge-4 b/gettext-tools/tests/msgmerge-4
index df23377..423ea08 100755
--- a/gettext-tools/tests/msgmerge-4
+++ b/gettext-tools/tests/msgmerge-4
@@ -25,8 +25,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test4.tmp mm-test4.in1.po mm-test4.in2.po || exit 1
-LC_ALL=C tr -d '\r' < mm-test4.tmp > mm-test4.out || exit 1
+${MSGMERGE} -q -o mm-test4.tmp mm-test4.in1.po mm-test4.in2.po || Exit 1
+LC_ALL=C tr -d '\r' < mm-test4.tmp > mm-test4.out || Exit 1
 
 cat <<EOF > mm-test4.ok
 msgid "one"
diff --git a/gettext-tools/tests/msgmerge-5 b/gettext-tools/tests/msgmerge-5
index db90c6f..0b25be2 100755
--- a/gettext-tools/tests/msgmerge-5
+++ b/gettext-tools/tests/msgmerge-5
@@ -41,8 +41,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q -o mm-test5.tmp mm-test5.in1.po mm-test5.in2.po >mm-test5.err 2>&1
 result=$?
 cat mm-test5.err | grep -v 'warning: Charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mm-test5.tmp > mm-test5.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mm-test5.tmp > mm-test5.out || Exit 1
 
 cat <<EOF > mm-test5.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-6 b/gettext-tools/tests/msgmerge-6
index 1d07320..9b66bc7 100755
--- a/gettext-tools/tests/msgmerge-6
+++ b/gettext-tools/tests/msgmerge-6
@@ -55,8 +55,8 @@ EOF
 
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q -o mm-test6.tmp mm-test6.in1.po mm-test6.in2.po || exit 1
-LC_ALL=C tr -d '\r' < mm-test6.tmp > mm-test6.out || exit 1
+${MSGMERGE} -q -o mm-test6.tmp mm-test6.in1.po mm-test6.in2.po || Exit 1
+LC_ALL=C tr -d '\r' < mm-test6.tmp > mm-test6.out || Exit 1
 
 cat <<\EOF > mm-test6.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-7 b/gettext-tools/tests/msgmerge-7
index de33984..cdc7542 100755
--- a/gettext-tools/tests/msgmerge-7
+++ b/gettext-tools/tests/msgmerge-7
@@ -39,8 +39,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test7.tmp mm-test7.po mm-test7.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test7.tmp > mm-test7.out || exit 1
+${MSGMERGE} -q -o mm-test7.tmp mm-test7.po mm-test7.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test7.tmp > mm-test7.out || Exit 1
 
 cat <<\EOF > mm-test7.ok
 domain "foo-de"
diff --git a/gettext-tools/tests/msgmerge-8 b/gettext-tools/tests/msgmerge-8
index 32a8373..c5fb4dc 100755
--- a/gettext-tools/tests/msgmerge-8
+++ b/gettext-tools/tests/msgmerge-8
@@ -35,8 +35,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} --multi-domain -q -o mm-test8.tmp mm-test8.po mm-test8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test8.tmp > mm-test8.out || exit 1
+${MSGMERGE} --multi-domain -q -o mm-test8.tmp mm-test8.po mm-test8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test8.tmp > mm-test8.out || Exit 1
 
 cat <<\EOF > mm-test8.ok
 domain "foo-de"
diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1
index 449a1b8..3d4e008 100755
--- a/gettext-tools/tests/msgmerge-compendium-1
+++ b/gettext-tools/tests/msgmerge-compendium-1
@@ -26,8 +26,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-1.com -o mm-c-1.tmp mm-c-1.in1 mm-c-1.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-1.tmp > mm-c-1.out || exit 1
+${MSGMERGE} -q -C mm-c-1.com -o mm-c-1.tmp mm-c-1.in1 mm-c-1.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-1.tmp > mm-c-1.out || Exit 1
 
 cat << EOF > mm-c-1.ok
 #: file.c:123
diff --git a/gettext-tools/tests/msgmerge-compendium-2 b/gettext-tools/tests/msgmerge-compendium-2
index cace4b6..650075c 100755
--- a/gettext-tools/tests/msgmerge-compendium-2
+++ b/gettext-tools/tests/msgmerge-compendium-2
@@ -26,8 +26,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-2.com -o mm-c-2.tmp mm-c-2.in1 mm-c-2.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-2.tmp > mm-c-2.out || exit 1
+${MSGMERGE} -q -C mm-c-2.com -o mm-c-2.tmp mm-c-2.in1 mm-c-2.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-2.tmp > mm-c-2.out || Exit 1
 
 cat << EOF > mm-c-2.ok
 #: file.c:123
diff --git a/gettext-tools/tests/msgmerge-compendium-3 b/gettext-tools/tests/msgmerge-compendium-3
index d209305..ce4e543 100755
--- a/gettext-tools/tests/msgmerge-compendium-3
+++ b/gettext-tools/tests/msgmerge-compendium-3
@@ -34,8 +34,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-3.com -o mm-c-3.tmp mm-c-3.in1 mm-c-3.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-3.tmp > mm-c-3.out || exit 1
+${MSGMERGE} -q -C mm-c-3.com -o mm-c-3.tmp mm-c-3.in1 mm-c-3.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-3.tmp > mm-c-3.out || Exit 1
 
 cat << EOF > mm-c-3.ok
 #: file.c:123
diff --git a/gettext-tools/tests/msgmerge-compendium-4 b/gettext-tools/tests/msgmerge-compendium-4
index a831624..050664e 100755
--- a/gettext-tools/tests/msgmerge-compendium-4
+++ b/gettext-tools/tests/msgmerge-compendium-4
@@ -27,8 +27,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --compendium mm-c-4.com -o mm-c-4.tmp /dev/null mm-c-4.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-4.tmp > mm-c-4.out || exit 1
+${MSGMERGE} -q --compendium mm-c-4.com -o mm-c-4.tmp /dev/null mm-c-4.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-4.tmp > mm-c-4.out || Exit 1
 
 cat << \EOF > mm-c-4.ok
 msgid ""
diff --git a/gettext-tools/tests/msgmerge-compendium-5 b/gettext-tools/tests/msgmerge-compendium-5
index eb80ed4..5c28dd1 100755
--- a/gettext-tools/tests/msgmerge-compendium-5
+++ b/gettext-tools/tests/msgmerge-compendium-5
@@ -6,8 +6,8 @@
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-5.tmp \
   --compendium "$abs_srcdir"/mm-viet.comp.po \
-  /dev/null "$abs_srcdir"/mm-viet.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out || exit 1
+  /dev/null "$abs_srcdir"/mm-viet.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} "$abs_srcdir"/mm-viet.out mm-c-5.out
diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6
index dd04119..d5e7731 100755
--- a/gettext-tools/tests/msgmerge-compendium-6
+++ b/gettext-tools/tests/msgmerge-compendium-6
@@ -19,63 +19,63 @@ ${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po "$abs_srcdir"/mm-ko-comp.euc-k
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEE.tmp \
   --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out || exit 1
+  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out || exit 1
+  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUE.tmp \
   --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out || exit 1
+  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out || exit 1
+  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEE.tmp \
   --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out || exit 1
+  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out || exit 1
+  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UUE.tmp \
   --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  mm-ko.utf-8.po mm-ko.utf-8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out || exit 1
+  mm-ko.utf-8.po mm-ko.utf-8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UUU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  mm-ko.utf-8.po mm-ko.utf-8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out || exit 1
+  mm-ko.utf-8.po mm-ko.utf-8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out || Exit 1
 
 : ${MSGCONV=msgconv}
 ${MSGCONV} --to-code=UTF-8 mm-c-6-UUU.out | LC_ALL=C tr -d '\r' > mm-c-6-U.ok
 ${MSGCONV} --to-code=EUC-KR mm-c-6-UUU.out | LC_ALL=C sed -e 's,EUC-KR,euc-kr,' | LC_ALL=C tr -d '\r' > mm-c-6-E.ok
 
 : ${DIFF=diff}
-${DIFF} mm-c-6-E.ok mm-c-6-AEE.out || { exit 1; }
-${DIFF} mm-c-6-E.ok mm-c-6-AEU.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-AUE.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-AUU.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-UEE.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-UEU.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-UUE.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-UUU.out || { exit 1; }
+${DIFF} mm-c-6-E.ok mm-c-6-AEE.out || { Exit 1; }
+${DIFF} mm-c-6-E.ok mm-c-6-AEU.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-AUE.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-AUU.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UEE.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UEU.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UUE.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UUU.out || { Exit 1; }
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-properties-1 b/gettext-tools/tests/msgmerge-properties-1
index ff7c968..f7554b6 100755
--- a/gettext-tools/tests/msgmerge-properties-1
+++ b/gettext-tools/tests/msgmerge-properties-1
@@ -35,8 +35,8 @@ still\ existing=here is normally no comment
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --properties-input --properties-output -o mm-p-1.tmp mm-p-1.in1 mm-p-1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mm-p-1.tmp > mm-p-1.out || exit 1
+${MSGMERGE} -q --properties-input --properties-output -o mm-p-1.tmp mm-p-1.in1 mm-p-1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mm-p-1.tmp > mm-p-1.out || Exit 1
 
 cat << EOF > mm-p-1.ok
 #: file3:102
diff --git a/gettext-tools/tests/msgmerge-properties-2 b/gettext-tools/tests/msgmerge-properties-2
index aace912..595f0eb 100755
--- a/gettext-tools/tests/msgmerge-properties-2
+++ b/gettext-tools/tests/msgmerge-properties-2
@@ -16,9 +16,9 @@ cat <<EOF > mm-p-2.pot
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --properties-input --update mm-p-2.po mm-p-2.pot || exit 1
-mv mm-p-2.po mm-p-2.tmp || { exit 1; }
-LC_ALL=C tr -d '\r' < mm-p-2.tmp > mm-p-2.po || exit 1
+${MSGMERGE} -q --properties-input --update mm-p-2.po mm-p-2.pot || Exit 1
+mv mm-p-2.po mm-p-2.tmp || { Exit 1; }
+LC_ALL=C tr -d '\r' < mm-p-2.tmp > mm-p-2.po || Exit 1
 
 cat <<\EOF > mm-p-2.ok
 #. location changed
diff --git a/gettext-tools/tests/msgmerge-update-1 b/gettext-tools/tests/msgmerge-update-1
index 4a77882..11f072a 100755
--- a/gettext-tools/tests/msgmerge-update-1
+++ b/gettext-tools/tests/msgmerge-update-1
@@ -59,7 +59,7 @@ EOF
 cp mm-u-1.po mm-u-1.bak
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update mm-u-1.po mm-u-1.pot || exit 1
+${MSGMERGE} -q --update mm-u-1.po mm-u-1.pot || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mm-u-1.bak mm-u-1.po
diff --git a/gettext-tools/tests/msgmerge-update-2 b/gettext-tools/tests/msgmerge-update-2
index 4f651ca..0c499c4 100755
--- a/gettext-tools/tests/msgmerge-update-2
+++ b/gettext-tools/tests/msgmerge-update-2
@@ -49,9 +49,9 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update mm-u-2.po mm-u-2.pot || exit 1
-mv mm-u-2.po mm-u-2.tmp || { exit 1; }
-LC_ALL=C tr -d '\r' < mm-u-2.tmp > mm-u-2.po || exit 1
+${MSGMERGE} -q --update mm-u-2.po mm-u-2.pot || Exit 1
+mv mm-u-2.po mm-u-2.tmp || { Exit 1; }
+LC_ALL=C tr -d '\r' < mm-u-2.tmp > mm-u-2.po || Exit 1
 
 cat <<\EOF > mm-u-2.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-update-3 b/gettext-tools/tests/msgmerge-update-3
index 7f45a45..a77606e 100755
--- a/gettext-tools/tests/msgmerge-update-3
+++ b/gettext-tools/tests/msgmerge-update-3
@@ -49,7 +49,7 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update mm-u-3.po mm-u-3.pot || exit 1
+${MSGMERGE} -q --update mm-u-3.po mm-u-3.pot || Exit 1
 
 cat <<\EOF > mm-u-3.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-update-4 b/gettext-tools/tests/msgmerge-update-4
index e76974b..8c4ea69 100755
--- a/gettext-tools/tests/msgmerge-update-4
+++ b/gettext-tools/tests/msgmerge-update-4
@@ -52,7 +52,7 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update --sort-output mm-u-4.po mm-u-4.pot || exit 1
+${MSGMERGE} -q --update --sort-output mm-u-4.po mm-u-4.pot || Exit 1
 
 cat <<\EOF > mm-u-4.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgunfmt-1 b/gettext-tools/tests/msgunfmt-1
index ccde087..76aa6ac 100755
--- a/gettext-tools/tests/msgunfmt-1
+++ b/gettext-tools/tests/msgunfmt-1
@@ -30,11 +30,11 @@ msgstr "second"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mu-test1.mo mu-test1.in || exit 1
+${MSGFMT} -o mu-test1.mo mu-test1.in || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mu-test1.tmp mu-test1.mo || exit 1
-LC_ALL=C tr -d '\r' < mu-test1.tmp > mu-test1.out || exit 1
+${MSGUNFMT} -o mu-test1.tmp mu-test1.mo || Exit 1
+LC_ALL=C tr -d '\r' < mu-test1.tmp > mu-test1.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mu-test1.in mu-test1.out
diff --git a/gettext-tools/tests/msgunfmt-2 b/gettext-tools/tests/msgunfmt-2
index 6bbac97..496e931 100755
--- a/gettext-tools/tests/msgunfmt-2
+++ b/gettext-tools/tests/msgunfmt-2
@@ -13,11 +13,11 @@ msgstr "schneide bei %<PRIuMAX> Bytes in Ausgabedatei %s ab"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mu-2.mo mu-2.in || exit 1
+${MSGFMT} -o mu-2.mo mu-2.in || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mu-2.tmp mu-2.mo || exit 1
-LC_ALL=C tr -d '\r' < mu-2.tmp > mu-2.out || exit 1
+${MSGUNFMT} -o mu-2.tmp mu-2.mo || Exit 1
+LC_ALL=C tr -d '\r' < mu-2.tmp > mu-2.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mu-2.in mu-2.out
diff --git a/gettext-tools/tests/msgunfmt-3 b/gettext-tools/tests/msgunfmt-3
index ce54a8f..42dc1cc 100755
--- a/gettext-tools/tests/msgunfmt-3
+++ b/gettext-tools/tests/msgunfmt-3
@@ -7,6 +7,6 @@
 
 for n in 1 2 3 4 5 6; do
   LANGUAGE= LC_ALL=C ${MSGUNFMT} "$abs_srcdir"/overflow-$n.mo 2>mu-3.err >/dev/null
-  test $? != 0 || exit 1
-  grep ' is truncated' mu-3.err >/dev/null || exit 1
+  test $? != 0 || Exit 1
+  grep ' is truncated' mu-3.err >/dev/null || Exit 1
 done
diff --git a/gettext-tools/tests/msgunfmt-csharp-1 b/gettext-tools/tests/msgunfmt-csharp-1
index 34c1141..fbbd5cc 100755
--- a/gettext-tools/tests/msgunfmt-csharp-1
+++ b/gettext-tools/tests/msgunfmt-csharp-1
@@ -6,15 +6,15 @@
 # Test whether we can compile and execute C# programs.
 test "${CSHARP_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-csharp"
-  exit 77
+  Exit 77
 }
 test "${BUILDCSHARP}" = yes || {
   echo "Skipping test: C# compiler not found"
-  exit 77
+  Exit 77
 }
 test "${TESTCSHARP}" = yes || {
   echo "Skipping test: C# engine not found"
-  exit 77
+  Exit 77
 }
 
 test -d mu-cs-1 || mkdir mu-cs-1
@@ -52,15 +52,15 @@ EOF
 
 : ${MSGFMT=msgfmt}
 GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
-${MSGFMT} --csharp -d mu-cs-1 -r prog -l fr mu-cs-1/fr.po || exit 1
+${MSGFMT} --csharp -d mu-cs-1 -r prog -l fr mu-cs-1/fr.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
 GETTEXTCSHARPEXEDIR=../../src \
 GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
-${MSGUNFMT} --csharp -d mu-cs-1 -r prog -l fr -o mu-cs-1/prog.out || exit 1
+${MSGUNFMT} --csharp -d mu-cs-1 -r prog -l fr -o mu-cs-1/prog.out || Exit 1
 
 : ${MSGCAT=msgcat}
-${MSGCAT} -s -o mu-cs-1/prog.sort mu-cs-1/prog.out || exit 1
+${MSGCAT} -s -o mu-cs-1/prog.sort mu-cs-1/prog.out || Exit 1
 
 cat <<\EOF > mu-cs-1/prog.ok
 msgid ""
@@ -87,6 +87,6 @@ msgid "{0} is replaced by {1}."
 msgstr "{1} remplace {0}."
 EOF
 : ${DIFF=diff}
-${DIFF} mu-cs-1/prog.ok mu-cs-1/prog.sort || exit 1
+${DIFF} mu-cs-1/prog.ok mu-cs-1/prog.sort || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgunfmt-java-1 b/gettext-tools/tests/msgunfmt-java-1
index 8857eb1..3b807f0 100755
--- a/gettext-tools/tests/msgunfmt-java-1
+++ b/gettext-tools/tests/msgunfmt-java-1
@@ -9,15 +9,15 @@
 # Test whether we can compile and execute Java programs.
 test "${JAVA_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-java"
-  exit 77
+  Exit 77
 }
 test "${BUILDJAVA}" = yes || {
   echo "Skipping test: Java compiler or jar not found"
-  exit 77
+  Exit 77
 }
 test "${TESTJAVA}" = yes || {
   echo "Skipping test: Java engine not found"
-  exit 77
+  Exit 77
 }
 
 test -d mu-java-1 || mkdir mu-java-1
@@ -54,15 +54,15 @@ msgstr "Fermer"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -j -d mu-java-1 -r prog -l fr mu-java-1/fr.po || exit 1
+${MSGFMT} -j -d mu-java-1 -r prog -l fr mu-java-1/fr.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
 CLASSPATH=mu-java-1${CLASSPATH:+:$CLASSPATH} \
 GETTEXTJEXEDIR=../../src GETTEXTJAR=../../src/gettext.jar \
-${MSGUNFMT} --java -d mu-java-1 -r prog -l fr -o mu-java-1/prog.out || exit 1
+${MSGUNFMT} --java -d mu-java-1 -r prog -l fr -o mu-java-1/prog.out || Exit 1
 
 : ${MSGCAT=msgcat}
-${MSGCAT} -s -o mu-java-1/prog.sort mu-java-1/prog.out || exit 1
+${MSGCAT} -s -o mu-java-1/prog.sort mu-java-1/prog.out || Exit 1
 
 cat <<\EOF > mu-java-1/prog.ok
 msgid ""
@@ -89,6 +89,6 @@ msgid "{0} is replaced by {1}."
 msgstr "{1} remplace {0}."
 EOF
 : ${DIFF=diff}
-${DIFF} mu-java-1/prog.ok mu-java-1/prog.sort || exit 1
+${DIFF} mu-java-1/prog.ok mu-java-1/prog.sort || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgunfmt-properties-1 b/gettext-tools/tests/msgunfmt-properties-1
index 41fd811..2184dbd 100755
--- a/gettext-tools/tests/msgunfmt-properties-1
+++ b/gettext-tools/tests/msgunfmt-properties-1
@@ -22,11 +22,11 @@ two=second
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --properties-input -o mu-p-1.mo mu-p-1.in || exit 1
+${MSGFMT} --properties-input -o mu-p-1.mo mu-p-1.in || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} --properties-output -o mu-p-1.tmp mu-p-1.mo || exit 1
-LC_ALL=C tr -d '\r' < mu-p-1.tmp > mu-p-1.out || exit 1
+${MSGUNFMT} --properties-output -o mu-p-1.tmp mu-p-1.mo || Exit 1
+LC_ALL=C tr -d '\r' < mu-p-1.tmp > mu-p-1.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mu-p-1.in mu-p-1.out
diff --git a/gettext-tools/tests/msgunfmt-tcl-1 b/gettext-tools/tests/msgunfmt-tcl-1
index ab493d7..6a2d2e0 100755
--- a/gettext-tools/tests/msgunfmt-tcl-1
+++ b/gettext-tools/tests/msgunfmt-tcl-1
@@ -18,7 +18,7 @@ puts $tcl_version
 EOF
 (tclsh mu-tcl-1-version.tcl) >/dev/null 2>/dev/null \
   || { echo "Skipping test: tclsh not found or Tcl too old"
-       exit 77
+       Exit 77
      }
 
 cat <<\EOF > mu-tcl-1-fr.po
@@ -39,11 +39,11 @@ EOF
 test -d mu-tcl-1-msgs || mkdir mu-tcl-1-msgs
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || exit 1
+${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
 GETTEXTDATADIR="$abs_top_srcdir"/src \
-${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || exit 1
+${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || Exit 1
 
 cat <<\EOF > mu-tcl-1-prog.ok
 msgid ""
@@ -56,6 +56,6 @@ msgid "%s is replaced by %s."
 msgstr "%2$s remplace %1$s."
 EOF
 : ${DIFF=diff}
-${DIFF} mu-tcl-1-prog.ok mu-tcl-1-prog.out || exit 1
+${DIFF} mu-tcl-1-prog.ok mu-tcl-1-prog.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msguniq-1 b/gettext-tools/tests/msguniq-1
index 326e48e..b96238e 100755
--- a/gettext-tools/tests/msguniq-1
+++ b/gettext-tools/tests/msguniq-1
@@ -4,8 +4,8 @@
 # Test general operation.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -o msguniq-1.tmp "$abs_srcdir"/msguniq-a.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out || exit 1
+${MSGUNIQ} -w 1000 -o msguniq-1.tmp "$abs_srcdir"/msguniq-a.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} "$abs_srcdir"/msguniq-a.out msguniq-1.out
diff --git a/gettext-tools/tests/msguniq-2 b/gettext-tools/tests/msguniq-2
index f5e77f9..234274a 100755
--- a/gettext-tools/tests/msguniq-2
+++ b/gettext-tools/tests/msguniq-2
@@ -4,8 +4,8 @@
 # Test --unique option.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp "$abs_srcdir"/msguniq-a.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out || exit 1
+${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp "$abs_srcdir"/msguniq-a.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out || Exit 1
 
 cat <<\EOF > msguniq-2.ok
 # Template messages for CLISP
diff --git a/gettext-tools/tests/msguniq-3 b/gettext-tools/tests/msguniq-3
index 672e0c3..0949d9d 100755
--- a/gettext-tools/tests/msguniq-3
+++ b/gettext-tools/tests/msguniq-3
@@ -4,8 +4,8 @@
 # Test --repeated option.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp "$abs_srcdir"/msguniq-a.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out || exit 1
+${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp "$abs_srcdir"/msguniq-a.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out || Exit 1
 
 cat <<\EOF > msguniq-3.ok
 # Template messages for CLISP
diff --git a/gettext-tools/tests/msguniq-4 b/gettext-tools/tests/msguniq-4
index 89e1279..e4e5e48 100755
--- a/gettext-tools/tests/msguniq-4
+++ b/gettext-tools/tests/msguniq-4
@@ -4,10 +4,10 @@
 # Test general operation with Java .properties syntax.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out "$abs_srcdir"/msguniq-a.inp || exit 1
+${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out "$abs_srcdir"/msguniq-a.inp || Exit 1
 
 : ${MSGCAT-msgcat}
-${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok "$abs_srcdir"/msguniq-a.out || exit 1
+${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok "$abs_srcdir"/msguniq-a.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} msguniq-4.ok msguniq-4.out
diff --git a/gettext-tools/tests/msguniq-5 b/gettext-tools/tests/msguniq-5
index 530efab..a73aecb 100755
--- a/gettext-tools/tests/msguniq-5
+++ b/gettext-tools/tests/msguniq-5
@@ -54,8 +54,8 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -o msguniq-5.tmp msguniq-5.po || exit 1
-LC_ALL=C tr -d '\r' < msguniq-5.tmp > msguniq-5.out || exit 1
+${MSGUNIQ} -o msguniq-5.tmp msguniq-5.po || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-5.tmp > msguniq-5.out || Exit 1
 
 cat <<\EOF > msguniq-5.ok
 msgid ""
diff --git a/gettext-tools/tests/msguniq-6 b/gettext-tools/tests/msguniq-6
index 51a1220..36d5027 100755
--- a/gettext-tools/tests/msguniq-6
+++ b/gettext-tools/tests/msguniq-6
@@ -67,8 +67,8 @@ msgstr "%s: Option erwartet ein Argument -- %c\n"
 EOF
 
 : ${MSGUNIQ=msguniq}
-${MSGUNIQ} -o msguniq-6.tmp msguniq-6.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-6.tmp > msguniq-6.out || exit 1
+${MSGUNIQ} -o msguniq-6.tmp msguniq-6.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-6.tmp > msguniq-6.out || Exit 1
 
 cat <<\EOF > msguniq-6.ok
 msgid ""
diff --git a/gettext-tools/tests/msguniq-7 b/gettext-tools/tests/msguniq-7
index 5cae2e9..a866270 100755
--- a/gettext-tools/tests/msguniq-7
+++ b/gettext-tools/tests/msguniq-7
@@ -14,8 +14,8 @@ msgstr ""
 EOF
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} --add-location=file -o msguniq-7.tmp msguniq-7.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-7.tmp > msguniq-7.out || exit 1
+${MSGUNIQ} --add-location=file -o msguniq-7.tmp msguniq-7.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-7.tmp > msguniq-7.out || Exit 1
 
 cat <<\EOF > msguniq-7.ok
 #: foo bar
diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1
index 198283a..66dd10b 100755
--- a/gettext-tools/tests/plural-1
+++ b/gettext-tools/tests/plural-1
@@ -2,8 +2,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$abs_srcdir"/plural-1-prg.c || exit 1
-LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot || exit 1
+${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$abs_srcdir"/plural-1-prg.c || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot || Exit 1
 
 cat <<EOF > plural-1-cake.ok
 #, c-format
@@ -14,7 +14,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} plural-1-cake.ok plural-1-cake.pot || exit 1
+${DIFF} plural-1-cake.ok plural-1-cake.pot || Exit 1
 
 cat <<EOF > plural-1-fr.po
 # Les gateaux allemands sont les meilleurs du monde.
@@ -26,11 +26,11 @@ msgstr[1] "%d morceaux de gateau"
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o plural-1-fr.po.tmp plural-1-fr.po plural-1-cake.pot || exit 1
-LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.new || exit 1
+${MSGMERGE} -q -o plural-1-fr.po.tmp plural-1-fr.po plural-1-cake.pot || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} plural-1-fr.po plural-1-fr.po.new || exit 1
+${DIFF} plural-1-fr.po plural-1-fr.po.new || Exit 1
 
 test -d plural-1-dir || mkdir plural-1-dir
 test -d plural-1-dir/fr || mkdir plural-1-dir/fr
@@ -40,26 +40,26 @@ test -d plural-1-dir/fr/LC_MESSAGES || mkdir plural-1-dir/fr/LC_MESSAGES
 ${MSGFMT} -o plural-1-dir/fr/LC_MESSAGES/cake.mo plural-1-fr.po
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o plural-1-fr.po.tmp plural-1-dir/fr/LC_MESSAGES/cake.mo || exit 1
-LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.un || exit 1
+${MSGUNFMT} -o plural-1-fr.po.tmp plural-1-dir/fr/LC_MESSAGES/cake.mo || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.un || Exit 1
 
 sed 1,2d < plural-1-fr.po > plural-1-fr.po.strip
 
 : ${DIFF=diff}
-${DIFF} plural-1-fr.po.strip plural-1-fr.po.un || exit 1
+${DIFF} plural-1-fr.po.strip plural-1-fr.po.un || Exit 1
 
 : ${DIFF=diff}
 echo 'un morceau de gateau' > plural-1-cake.ok
-LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || exit 1
-LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
-${DIFF} plural-1-cake.ok cake.out || exit 1
+LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+${DIFF} plural-1-cake.ok cake.out || Exit 1
 echo '2 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || exit 1
-LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
-${DIFF} plural-1-cake.ok cake.out || exit 1
+LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+${DIFF} plural-1-cake.ok cake.out || Exit 1
 echo '10 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || exit 1
-LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
-${DIFF} plural-1-cake.ok cake.out || exit 1
+LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+${DIFF} plural-1-cake.ok cake.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/plural-1-prg.c b/gettext-tools/tests/plural-1-prg.c
index 9b32f7c..1480738 100644
--- a/gettext-tools/tests/plural-1-prg.c
+++ b/gettext-tools/tests/plural-1-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the plural-1 test.
-   Copyright (C) 2001-2002, 2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2009, 2015-2016 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
diff --git a/gettext-tools/tests/plural-2 b/gettext-tools/tests/plural-2
index 4116263..983f207 100755
--- a/gettext-tools/tests/plural-2
+++ b/gettext-tools/tests/plural-2
@@ -65,7 +65,7 @@ msgstr[7] "7"
 msgstr[8] "8"
 msgstr[9] "9"
 EOF
-  ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || exit 1
+  ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || Exit 1
   (for i in '' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
      LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=plural-2-dir \
        $NGETTEXT --env LC_ALL=ll X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
@@ -75,8 +75,8 @@ EOF
     echo "plural=${formula}" 1>&2
     echo "Expected: $dataok" 1>&2
     echo "Got:      "`cat dataout` 1>&2
-    exit 1
+    Exit 1
   }
 done < plural-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/recode-sr-latin-1 b/gettext-tools/tests/recode-sr-latin-1
index af74893..9bdd912 100755
--- a/gettext-tools/tests/recode-sr-latin-1
+++ b/gettext-tools/tests/recode-sr-latin-1
@@ -10,7 +10,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 = none; then
@@ -19,7 +19,7 @@ if test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french UTF-8 locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 cat <<\EOF > rec-srl-1.in
@@ -34,7 +34,7 @@ EOF
 : ${RECODE=recode}
 LC_ALL=$LOCALE_FR_UTF8 \
 ${RECODE}-sr-latin < rec-srl-1.in > rec-srl-1.out \
-  || { exit 1; }
+  || { Exit 1; }
 
 cat <<\EOF > rec-srl-1.ok
 Ispravni argumenti su
diff --git a/gettext-tools/tests/recode-sr-latin-2 b/gettext-tools/tests/recode-sr-latin-2
index 7f13bd5..61aa233 100755
--- a/gettext-tools/tests/recode-sr-latin-2
+++ b/gettext-tools/tests/recode-sr-latin-2
@@ -16,7 +16,7 @@ if test $LOCALE_JA = none; then
   else
     echo "Skipping test: no japanese EUC-JP locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 cat <<\EOF > rec-srl-2.in
@@ -27,7 +27,7 @@ EOF
 : ${RECODE=recode}
 LC_ALL=$LOCALE_JA \
 ${RECODE}-sr-latin < rec-srl-2.in > rec-srl-2.out \
-  || { exit 1; }
+  || { Exit 1; }
 
 cat <<\EOF > rec-srl-2.ok
 Ispravni argumenti su
diff --git a/gettext-tools/tests/sentence b/gettext-tools/tests/sentence
deleted file mode 100755
index 481a20f..0000000
--- a/gettext-tools/tests/sentence
+++ /dev/null
@@ -1,228 +0,0 @@
-#! /bin/bash
-
-# sentence - temporary wrapper script for .libs/sentence
-# Generated by libtool (GNU libtool) 2.4.6
-#
-# The sentence program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command="(cd /home/ueno/devel/gettext/gettext-tools/tests; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/home/ueno/.local/bin:/home/ueno/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games; export PATH; gcc -std=gnu99 -O0 -g3 -Wall -o \$progdir/\$file sentence-sentence.o  ../src/.libs/libgettextsrc.so -L/usr/lib/x86_64-linux-gnu /home/ueno/devel/gettext/gettext-tools/gnulib-lib/.libs/libgettextlib.so -lacl -lm -lcroco-0.6 -lglib-2.0 -lncurses ../intl/.libs/libgnuintl.so -lc -fopenmp -Wl,-rpath -Wl,/home/ueno/devel/gettext/gettext-tools/src/.libs -Wl,-rpath -Wl,/home/ueno/devel/gettext/gettext-tools/gnulib-lib/.libs -Wl,-rpath -Wl,/home/ueno/devel/gettext/gettext-tools/intl/.libs)"
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='2.4.6'
-  notinst_deplibs=' ../src/libgettextsrc.la /home/ueno/devel/gettext/gettext-tools/gnulib-lib/libgettextlib.la ../intl/libgnuintl.la'
-else
-  # When we are sourced in execute mode, $file and $ECHO are already set.
-  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-    file="$0"
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-    ECHO="printf %s\\n"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ that is used only on
-# windows platforms, and (c) all begin with the string --lt-
-# (application programs are unlikely to have options that match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's ../libtool value, followed by no.
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=$0
-  shift
-  for lt_opt
-  do
-    case "$lt_opt" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
-        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
-        lt_dump_F=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 's%^.*/%%'`
-        cat "$lt_dump_D/$lt_dump_F"
-        exit 0
-      ;;
-    --lt-*)
-        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n "$lt_option_debug"; then
-    echo "sentence:sentence:$LINENO: libtool wrapper (GNU libtool) 2.4.6" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    $ECHO "sentence:sentence:$LINENO: newargv[$lt_dump_args_N]: $lt_arg"
-    lt_dump_args_N=`expr $lt_dump_args_N + 1`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-
-      if test -n "$lt_option_debug"; then
-        $ECHO "sentence:sentence:$LINENO: newargv[0]: $progdir/$program" 1>&2
-        func_lt_dump_args ${1+"$@"} 1>&2
-      fi
-      exec "$progdir/$program" ${1+"$@"}
-
-      $ECHO "$0: cannot exec $program $*" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from $@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case " $* " in
-  *\ --lt-*)
-    for lt_wr_arg
-    do
-      case $lt_wr_arg in
-      --lt-*) ;;
-      *) set x "$@" "$lt_wr_arg"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core ${1+"$@"}
-}
-
-  # Parse options
-  func_parse_lt_options "$0" ${1+"$@"}
-
-  # Find the directory that this script lives in.
-  thisdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
-  test "x$thisdir" = "x$file" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
-  while test -n "$file"; do
-    destdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
-
-    # If there was a directory component, then change thisdir.
-    if test "x$destdir" != "x$file"; then
-      case "$destdir" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
-      *) thisdir="$thisdir/$destdir" ;;
-      esac
-    fi
-
-    file=`$ECHO "$file" | /bin/sed 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
-  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
-    # special case for '.'
-    if test "$thisdir" = "."; then
-      thisdir=`pwd`
-    fi
-    # remove .libs from thisdir
-    case "$thisdir" in
-    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /bin/sed 's%[\\/][^\\/]*$%%'` ;;
-    .libs )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=`cd "$thisdir" && pwd`
-  test -n "$absdir" && thisdir="$absdir"
-
-  program=lt-'sentence'
-  progdir="$thisdir/.libs"
-
-  if test ! -f "$progdir/$program" ||
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
-
-    file="$$-$program"
-
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
-
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-	$ECHO "$relink_command_output" >&2
-	rm -f "$progdir/$file"
-	exit 1
-      fi
-    fi
-
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
-    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-      # Run the actual program with our arguments.
-      func_exec_program ${1+"$@"}
-    fi
-  else
-    # The program doesn't exist.
-    $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2
-    $ECHO "This script is just a wrapper for $program." 1>&2
-    $ECHO "See the libtool documentation for more information." 1>&2
-    exit 1
-  fi
-fi
diff --git a/gettext-tools/tests/sentence-1 b/gettext-tools/tests/sentence-1
new file mode 100755
index 0000000..62b5a04
--- /dev/null
+++ b/gettext-tools/tests/sentence-1
@@ -0,0 +1,121 @@
+#! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
+
+# Test of sentence handling.
+
+cat > s1.in <<\EOF
+1
+This is a primary sentence
+
+1
+This is a primary sentence.
+
+1
+This is a primary sentence.x
+
+2
+This is a primary sentence.  This is a secondary sentence
+
+1
+This is a primary sentence.  This is a secondary sentence
+
+1
+This is a primary sentence.'  This is a secondary sentence
+
+3
+This is a primary sentence.  This is a secondary sentence
+
+2
+This is a primary sentence.'  This is a secondary sentence
+
+2
+This is a primary sentence.'x  This is a secondary sentence
+
+2
+This is a primary sentence.''x  This is a secondary sentence
+
+2
+This is a primary sentence.
+This is a secondary sentence
+
+2
+This is a primary sentence. 
+This is a secondary sentence
+
+2
+This is a primary sentence. 
+This is a secondary sentence
+
+2
+This is a primary sentence.	This is a secondary sentence
+
+2
+This is a primary sentence.'	This is a secondary sentence
+
+2
+This is a primary sentence.'
+This is a secondary sentence
+
+EOF
+
+cat > s1.ok <<EOF
+FFFD
+
+
+2E
+.
+
+FFFD
+
+
+2E
+.  This is a secondary sentence
+
+2E
+.  This is a secondary sentence
+
+2E
+.'  This is a secondary sentence
+
+FFFD
+
+
+2E
+.'  This is a secondary sentence
+
+FFFD
+
+
+FFFD
+
+
+2E
+.
+This is a secondary sentence
+
+2E
+. 
+This is a secondary sentence
+
+2E
+. 
+This is a secondary sentence
+
+2E
+.	This is a secondary sentence
+
+2E
+.'	This is a secondary sentence
+
+2E
+.'
+This is a secondary sentence
+
+EOF
+
+../sentence-1-prg < s1.in > s1.out || Exit 1
+
+: ${DIFF=diff}
+${DIFF} s1.ok s1.out || Exit 1
+
+Exit 0
diff --git a/gettext-tools/tests/sentence-1-prg.c b/gettext-tools/tests/sentence-1-prg.c
new file mode 100644
index 0000000..84675e0
--- /dev/null
+++ b/gettext-tools/tests/sentence-1-prg.c
@@ -0,0 +1,79 @@
+/* Test of sentence handling.
+   Copyright (C) 2015-2016 Free Software Foundation, Inc.
+   Written by Daiki Ueno <ueno@gnu.org>, 2015.
+
+   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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "sentence.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+int
+main (int argc, char **argv)
+{
+  while (1)
+    {
+      char buffer[1024];
+      const char *result;
+      ucs4_t ending_char;
+      char *p, *newline;
+
+      memset (buffer, 0, sizeof buffer);
+
+      /* Read REQUIRED_SPACES parameter.  */
+      if (!fgets (buffer, sizeof (buffer) - 1, stdin))
+        break;
+
+      newline = strchr (buffer, '\n');
+      if (!newline)
+        return 1;
+      *newline = '\0';
+
+      sentence_end_required_spaces = atoi (buffer);
+
+      /* Collect lines until an empty line is read.  */
+      p = buffer;
+      while (1)
+        {
+          p = fgets (p, sizeof (buffer) - (p - buffer) - 1, stdin);
+          if (!p)
+            break;
+
+          if (*p == '\n')
+            break;
+
+          newline = strchr (p, '\n');
+          if (!newline)
+            return 1;
+
+          p = newline + 1;
+          *p = '\0';
+        }
+
+      if (p == NULL)
+        break;
+
+      *newline = '\0';
+      result = sentence_end (buffer, &ending_char);
+      printf ("%X\n%s\n\n", ending_char, result);
+    }
+
+  return 0;
+}
diff --git a/gettext-tools/tests/sentence.c b/gettext-tools/tests/sentence.c
deleted file mode 100644
index 839f6c8..0000000
--- a/gettext-tools/tests/sentence.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Test of sentence handling.
-   Copyright (C) 2015 Free Software Foundation, Inc.
-   Written by Daiki Ueno <ueno@gnu.org>, 2015.
-
-   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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "sentence.h"
-
-#include <assert.h>
-#include <string.h>
-
-#define PRIMARY "This is a primary sentence"
-#define SECONDARY "This is a secondary sentence"
-
-#define SIZEOF(x) (sizeof (x) / sizeof (*x))
-
-struct data
-{
-  int required_spaces;
-  const char *input;
-
-  const char *expected_prefix;
-  ucs4_t expected_ending_char;
-};
-
-const struct data data[] =
-  {
-    { 1, PRIMARY, PRIMARY, 0xfffd },
-    { 1, PRIMARY ".", PRIMARY, '.' },
-    { 1, PRIMARY ".x", PRIMARY ".x", 0xfffd },
-    { 2, PRIMARY ".  " SECONDARY, PRIMARY, '.' },
-    { 1, PRIMARY ".  " SECONDARY, PRIMARY, '.' },
-    { 1, PRIMARY ".' " SECONDARY, PRIMARY, '.' },
-    { 3, PRIMARY ".  " SECONDARY, PRIMARY ".  " SECONDARY, 0xfffd },
-    { 2, PRIMARY ".'  " SECONDARY, PRIMARY, '.' },
-    { 2, PRIMARY ".'x  " SECONDARY, PRIMARY ".'x  " SECONDARY, 0xfffd },
-    { 2, PRIMARY ".''x  " SECONDARY, PRIMARY ".''x  " SECONDARY, 0xfffd },
-    { 2, PRIMARY ".\n" SECONDARY, PRIMARY, '.' },
-    { 2, PRIMARY ". \n" SECONDARY, PRIMARY, '.' },
-    { 2, PRIMARY ".\xc2\xa0\n" SECONDARY, PRIMARY, '.' },
-    { 2, PRIMARY ".\t" SECONDARY, PRIMARY, '.' },
-    { 2, PRIMARY ".'\t" SECONDARY, PRIMARY, '.' },
-    { 2, PRIMARY ".'\n" SECONDARY, PRIMARY, '.' }
-  };
-
-static void
-check_sentence_end (const struct data *d)
-{
-  int saved_required_spaces = sentence_end_required_spaces;
-  const char *result;
-  ucs4_t ending_char;
-
-  sentence_end_required_spaces = d->required_spaces;
-  result = sentence_end (d->input, &ending_char);
-  sentence_end_required_spaces = saved_required_spaces;
-
-  assert (result == d->input + strlen (d->expected_prefix));
-  assert (ending_char == d->expected_ending_char);
-}
-
-int
-main (int argc, char **argv)
-{
-  int i;
-
-  for (i = 0; i < SIZEOF (data); i++)
-    check_sentence_end (&data[i]);
-
-  return 0;
-}
diff --git a/gettext-tools/tests/setlocale.c b/gettext-tools/tests/setlocale.c
index fd92909..2c19ea2 100644
--- a/gettext-tools/tests/setlocale.c
+++ b/gettext-tools/tests/setlocale.c
@@ -1,5 +1,5 @@
 /* Fake setlocale - platform independent, for testing purposes.
-   Copyright (C) 2001-2002, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2015-2016 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
diff --git a/gettext-tools/tests/testlocale.c b/gettext-tools/tests/testlocale.c
index 5573e34..b2dbbb6 100644
--- a/gettext-tools/tests/testlocale.c
+++ b/gettext-tools/tests/testlocale.c
@@ -1,5 +1,5 @@
 /* testlocale - test whether the locale given by the environment is installed.
-   Copyright (C) 2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2015-2016 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
diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c
index f59e61f..e1c6d1b 100644
--- a/gettext-tools/tests/tstgettext.c
+++ b/gettext-tools/tests/tstgettext.c
@@ -1,5 +1,5 @@
 /* gettext - retrieve text string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2007, 2012, 2015 Free Software
+   Copyright (C) 1995-1997, 2000-2007, 2012, 2015-2016 Free Software
    Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995.
 
diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c
index 2e039a0..b274fae 100644
--- a/gettext-tools/tests/tstngettext.c
+++ b/gettext-tools/tests/tstngettext.c
@@ -1,5 +1,5 @@
 /* ngettext - retrieve plural form strings from message catalog and print them.
-   Copyright (C) 1995-1997, 2000-2007, 2012, 2015 Free Software
+   Copyright (C) 1995-1997, 2000-2007, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/tests/xg-c-1.ok.po b/gettext-tools/tests/xg-c-1.ok.po
index 5299d6f..db869cd 100644
--- a/gettext-tools/tests/xg-c-1.ok.po
+++ b/gettext-tools/tests/xg-c-1.ok.po
@@ -196,7 +196,7 @@ msgstr ""
 msgid ""
 "      --check=NAME            perform syntax check on messages\n"
 "                                (ellipsis-unicode, space-ellipsis,\n"
-"                                 quote-unicode)\n"
+"                                 quote-unicode, bullet-unicode)\n"
 msgstr ""
 
 #, c-format
@@ -263,6 +263,14 @@ msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
 #, c-format
+msgid "      --its=FILE              apply ITS rules from FILE\n"
+msgstr ""
+
+#, c-format
+msgid "                                (only XML based languages)\n"
+msgstr ""
+
+#, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
@@ -341,10 +349,6 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "      --its=FILE              apply ITS rules from FILE\n"
-msgstr ""
-
-#, c-format
 msgid "      --itstool               write out itstool comments\n"
 msgstr ""
 
diff --git a/gettext-tools/tests/xgettext-1 b/gettext-tools/tests/xgettext-1
index 5165968..29695a3 100755
--- a/gettext-tools/tests/xgettext-1
+++ b/gettext-tools/tests/xgettext-1
@@ -12,7 +12,7 @@ ${XGETTEXT} -k_ -d zero-domain -x "$abs_top_srcdir"/po/gettext-tools.pot \
   "$abs_top_srcdir"/src/xgettext.c >xg-test1.err 2>&1
 result=$?
 cat xg-test1.err | grep -v 'warning: Charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 test ! -f zero-domain.po
 result=$?
diff --git a/gettext-tools/tests/xgettext-10 b/gettext-tools/tests/xgettext-10
index 632a4ee..b82fa95 100755
--- a/gettext-tools/tests/xgettext-10
+++ b/gettext-tools/tests/xgettext-10
@@ -17,7 +17,7 @@ ${XGETTEXT} --add-location=file --omit-header xg-test10a.c xg-test10b.c \
             -o xg-test10.out >xg-test10.err 2>&1
 result=$?
 cat xg-test10.err | grep -v 'warning: Charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > xg-test10.ok
 #: xg-test10a.c xg-test10b.c
diff --git a/gettext-tools/tests/xgettext-11 b/gettext-tools/tests/xgettext-11
index 1b7a869..2378cea 100755
--- a/gettext-tools/tests/xgettext-11
+++ b/gettext-tools/tests/xgettext-11
@@ -17,8 +17,8 @@ gettext ("def");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --no-location --omit-header --add-comments=TRANSLATORS: -d xg-test11.tmp xg-test11.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test11.tmp.po > xg-test11.po || exit 1
+${XGETTEXT} --no-location --omit-header --add-comments=TRANSLATORS: -d xg-test11.tmp xg-test11.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test11.tmp.po > xg-test11.po || Exit 1
 
 cat <<\EOF > xg-test11.ok
 #. TRANSLATORS: this
diff --git a/gettext-tools/tests/xgettext-12 b/gettext-tools/tests/xgettext-12
index fe76f1a..e0ffb5a 100755
--- a/gettext-tools/tests/xgettext-12
+++ b/gettext-tools/tests/xgettext-12
@@ -15,8 +15,8 @@ xngettext ("def", 1);
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-comments -kngettext:1,1 -kxngettext:1,1 -d xg-test12.tmp xg-test12.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test12.tmp.po > xg-test12.po || exit 1
+${XGETTEXT} --omit-header --add-comments -kngettext:1,1 -kxngettext:1,1 -d xg-test12.tmp xg-test12.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test12.tmp.po > xg-test12.po || Exit 1
 
 cat <<\EOF > xg-test12.ok
 #: xg-test12.c:1 xg-test12.c:2
diff --git a/gettext-tools/tests/xgettext-13 b/gettext-tools/tests/xgettext-13
index dcd1004..923a67d 100755
--- a/gettext-tools/tests/xgettext-13
+++ b/gettext-tools/tests/xgettext-13
@@ -36,8 +36,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --add-location --width=30 -d xg-test13.tmp \
-            xg-test13.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test13.tmp.po > xg-test13.po || exit 1
+            xg-test13.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test13.tmp.po > xg-test13.po || Exit 1
 
 cat <<\EOF > xg-test13.ok
 #: x:1 x:2 x:3 x:4 x:5 x:6 x:7
diff --git a/gettext-tools/tests/xgettext-14 b/gettext-tools/tests/xgettext-14
index b769b2f..8035820 100755
--- a/gettext-tools/tests/xgettext-14
+++ b/gettext-tools/tests/xgettext-14
@@ -20,11 +20,11 @@ EOF
 : ${XGETTEXT=xgettext}
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=ellipsis-unicode -d xg-ellipsis-u.tmp xg-ellipsis-u.c 2>xg-ellipsis-u.err
 
-test `grep -c 'ASCII ellipsis' xg-ellipsis-u.err` = 4 || exit 1
+test `grep -c 'ASCII ellipsis' xg-ellipsis-u.err` = 4 || Exit 1
 
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=ellipsis-unicode --sentence-end=double-space -d xg-ellipsis-ud.tmp xg-ellipsis-u.c 2>xg-ellipsis-ud.err
 
-test `grep -c 'ASCII ellipsis' xg-ellipsis-ud.err` = 3 || exit 1
+test `grep -c 'ASCII ellipsis' xg-ellipsis-ud.err` = 3 || Exit 1
 
 # --check=space-ellipsis
 cat <<\EOF > xg-space-e.c
@@ -40,7 +40,7 @@ EOF
 
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=space-ellipsis -d xg-space-e.tmp xg-space-e.c 2>xg-space-e.err
 
-test `grep -c 'space before ellipsis' xg-space-e.err` = 3 || exit 1
+test `grep -c 'space before ellipsis' xg-space-e.err` = 3 || Exit 1
 
 # --check=quote-unicode
 cat <<\EOF > xg-quote-u.c
@@ -94,5 +94,42 @@ EOF
 
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=quote-unicode -d xg-quote-u.tmp xg-quote-u.c 2>xg-quote-u.err
 
-test `grep -c 'ASCII double quote' xg-quote-u.err` = 4 || exit 1
-test `grep -c 'ASCII single quote' xg-quote-u.err` = 12 || exit 1
+test `grep -c 'ASCII double quote' xg-quote-u.err` = 4 || Exit 1
+test `grep -c 'ASCII single quote' xg-quote-u.err` = 12 || Exit 1
+
+# --check=bullet-unicode
+cat <<\EOF > xg-bullet-u1.c
+gettext ("The following is a list of items:\n\
+* item 1\n\
+* item 2\n\
+* item 3\n");
+EOF
+
+: ${XGETTEXT=xgettext}
+LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=bullet-unicode -d xg-bullet-u1.tmp xg-bullet-u1.c 2>xg-bullet-u1.err
+
+test `grep -c 'ASCII bullet' xg-bullet-u1.err` = 1 || { cat xg-bullet-u1.err; Exit 1; }
+
+cat <<\EOF > xg-bullet-u2.c
+gettext ("The following is a list of items:\n\
+* item 1\n\
+ - item 2\n\
+* item 3\n");
+EOF
+
+: ${XGETTEXT=xgettext}
+LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=bullet-unicode -d xg-bullet-u2.tmp xg-bullet-u2.c 2>xg-bullet-u2.err
+
+test `grep -c 'ASCII bullet' xg-bullet-u2.err` = 1 || { cat xg-bullet-u2.err; Exit 1; }
+
+cat <<\EOF > xg-bullet-u3.c
+gettext ("The following is NOT a list of items:\n\
+* item 1\n\
+- item 2\n\
+* item 3\n");
+EOF
+
+: ${XGETTEXT=xgettext}
+LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=bullet-unicode -d xg-bullet-u3.tmp xg-bullet-u3.c 2>xg-bullet-u3.err
+
+test `grep -c 'ASCII bullet' xg-bullet-u3.err` = 0 || { cat xg-bullet-u3.err; Exit 1; }
diff --git a/gettext-tools/tests/xgettext-2 b/gettext-tools/tests/xgettext-2
index ffdd355..0535a97 100755
--- a/gettext-tools/tests/xgettext-2
+++ b/gettext-tools/tests/xgettext-2
@@ -22,8 +22,8 @@ _("")
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-test2.tmp -k_ --omit-header --no-location xg-test2.in.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test2.tmp.po > xg-test2.po || exit 1
+${XGETTEXT} -d xg-test2.tmp -k_ --omit-header --no-location xg-test2.in.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test2.tmp.po > xg-test2.po || Exit 1
 
 cat <<EOF > xg-test2.ok
 #, no-c-format
diff --git a/gettext-tools/tests/xgettext-5 b/gettext-tools/tests/xgettext-5
index b3e7380..85be8ef 100755
--- a/gettext-tools/tests/xgettext-5
+++ b/gettext-tools/tests/xgettext-5
@@ -13,9 +13,9 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --no-location -k_ -o xg-test5.po xg-test5.c 2>/dev/null
-test $? = 1 || { exit 1; }
-${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.tmp xg-test5.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test5.tmp > xg-test5.po || exit 1
+test $? = 1 || { Exit 1; }
+${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.tmp xg-test5.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test5.tmp > xg-test5.po || Exit 1
 
 sed -e '/POT-Creation-Date/d' < xg-test5.po > xg-test5.pot
 
diff --git a/gettext-tools/tests/xgettext-6 b/gettext-tools/tests/xgettext-6
index 5a54aa3..2bb6c76 100755
--- a/gettext-tools/tests/xgettext-6
+++ b/gettext-tools/tests/xgettext-6
@@ -78,8 +78,8 @@ ${XGETTEXT} --omit-header --no-location -d xg-test6.tmp \
   --flag=my_printf:1:python-format \
   xg-test6.c xg-test6.sh xg-test6.py xg-test6.lisp xg-test6.el \
   xg-test6.jl xg-test6.java xg-test6.awk xg-test6.ycp xg-test6.tcl \
-  xg-test6.pl xg-test6.php  || exit 1
-LC_ALL=C tr -d '\r' < xg-test6.tmp.po > xg-test6.po || exit 1
+  xg-test6.pl xg-test6.php  || Exit 1
+LC_ALL=C tr -d '\r' < xg-test6.tmp.po > xg-test6.po || Exit 1
 
 cat <<\EOF > xg-test6.ok
 #, c-format
diff --git a/gettext-tools/tests/xgettext-7 b/gettext-tools/tests/xgettext-7
index 22e882b..3bd94fc 100755
--- a/gettext-tools/tests/xgettext-7
+++ b/gettext-tools/tests/xgettext-7
@@ -18,8 +18,8 @@ gettext ("abc");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-comments -d xg-test7.tmp xg-test7.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po || exit 1
+${XGETTEXT} --omit-header --add-comments -d xg-test7.tmp xg-test7.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po || Exit 1
 
 cat <<\EOF > xg-test7.ok
 #. first comment
diff --git a/gettext-tools/tests/xgettext-8 b/gettext-tools/tests/xgettext-8
index 2194aed..8475a89 100755
--- a/gettext-tools/tests/xgettext-8
+++ b/gettext-tools/tests/xgettext-8
@@ -32,7 +32,7 @@ _("extract me")
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -a -j -o xg-test8.po xg-test8.in.c || exit 1
+${XGETTEXT} -a -j -o xg-test8.po xg-test8.in.c || Exit 1
 
 sed -e '/POT-Creation-Date/d' < xg-test8.po | LC_ALL=C tr -d '\r' > xg-test8.pot
 
diff --git a/gettext-tools/tests/xgettext-9 b/gettext-tools/tests/xgettext-9
index 9489be0..fb16dc9 100755
--- a/gettext-tools/tests/xgettext-9
+++ b/gettext-tools/tests/xgettext-9
@@ -23,8 +23,8 @@ EOF
 ${XGETTEXT} --omit-header \
   --keyword=label:1,\"xhtml-format\",\"xml-format\" \
   --keyword=title:1,\"xhtml-format\",\"xml-format\" \
-  -d xg-test9.tmp xg-test9.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test9.tmp.po > xg-test9.po || exit 1
+  -d xg-test9.tmp xg-test9.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test9.tmp.po > xg-test9.po || Exit 1
 
 cat <<\EOF > xg-test9.ok
 #. xhtml-format
diff --git a/gettext-tools/tests/xgettext-appdata-1 b/gettext-tools/tests/xgettext-appdata-1
index 47a8884..ac0ed7e 100755
--- a/gettext-tools/tests/xgettext-appdata-1
+++ b/gettext-tools/tests/xgettext-appdata-1
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gs-1.pot xg-gs-1-empty.appdata.xml 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without AppData support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gs-1.appdata.xml
@@ -57,7 +57,7 @@ cat <<EOF > xg-gs-1.appdata.xml
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o - xg-gs-1.appdata.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot || exit 1
+${XGETTEXT} --add-comments -o - xg-gs-1.appdata.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot || Exit 1
 
 cat <<EOF > xg-gs-1.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-awk-1 b/gettext-tools/tests/xgettext-awk-1
index bd82add..651ea4e 100755
--- a/gettext-tools/tests/xgettext-awk-1
+++ b/gettext-tools/tests/xgettext-awk-1
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-a-1.tmp xg-a-1.awk || exit 1
-LC_ALL=C tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po || exit 1
+  -d xg-a-1.tmp xg-a-1.awk || Exit 1
+LC_ALL=C tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po || Exit 1
 
 cat <<EOF > xg-a-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-awk-2 b/gettext-tools/tests/xgettext-awk-2
index 14908fe..4c904c8 100755
--- a/gettext-tools/tests/xgettext-awk-2
+++ b/gettext-tools/tests/xgettext-awk-2
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-a-2.tmp xg-a-2.awk || exit 1
-LC_ALL=C tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po || exit 1
+  -d xg-a-2.tmp xg-a-2.awk || Exit 1
+LC_ALL=C tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po || Exit 1
 
 cat <<EOF > xg-a-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-c-1 b/gettext-tools/tests/xgettext-c-1
index 039e7ec..b1b5e10 100755
--- a/gettext-tools/tests/xgettext-c-1
+++ b/gettext-tools/tests/xgettext-c-1
@@ -7,8 +7,8 @@
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-c-1.tmp -k_ --omit-header --no-location \
- "$abs_top_srcdir"/src/xgettext.c "$abs_top_srcdir"/src/msgfmt.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po || exit 1
+ "$abs_top_srcdir"/src/xgettext.c "$abs_top_srcdir"/src/msgfmt.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} "$abs_srcdir"/xg-c-1.ok.po xg-c-1.po
diff --git a/gettext-tools/tests/xgettext-c-10 b/gettext-tools/tests/xgettext-c-10
index 5c876b0..9e4e3e9 100755
--- a/gettext-tools/tests/xgettext-c-10
+++ b/gettext-tools/tests/xgettext-c-10
@@ -16,8 +16,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location \
   --keyword=i18n:1 --keyword=i18n:1c,2 --keyword=tr:1 --keyword=tr:1,2c \
-  -d xg-c-10.tmp xg-c-10.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po || exit 1
+  -d xg-c-10.tmp xg-c-10.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po || Exit 1
 
 cat <<EOF > xg-c-10.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-c-11 b/gettext-tools/tests/xgettext-c-11
index 2019eb8..bc66f31 100755
--- a/gettext-tools/tests/xgettext-c-11
+++ b/gettext-tools/tests/xgettext-c-11
@@ -16,8 +16,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location \
   --keyword=i18n:1 --keyword=i18n:1c,2,2t --keyword=i18n:1,2,3t \
-  -d xg-c-11.tmp xg-c-11.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po || exit 1
+  -d xg-c-11.tmp xg-c-11.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po || Exit 1
 
 cat <<EOF > xg-c-11.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-c-12 b/gettext-tools/tests/xgettext-c-12
index 2e9d7fd..6fe1d7f 100755
--- a/gettext-tools/tests/xgettext-c-12
+++ b/gettext-tools/tests/xgettext-c-12
@@ -9,8 +9,8 @@ gettext ("%1% on, %2% off");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-12.tmp xg-c-12.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-c-12.tmp xg-c-12.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po || Exit 1
 
 cat <<EOF > xg-c-12.ok
 msgid "%1% on, %2% off"
diff --git a/gettext-tools/tests/xgettext-c-13 b/gettext-tools/tests/xgettext-c-13
index 01464b0..9e33faa 100755
--- a/gettext-tools/tests/xgettext-c-13
+++ b/gettext-tools/tests/xgettext-c-13
@@ -15,8 +15,8 @@ ${XGETTEXT} --omit-header --no-location -d xg-c-13.tmp \
   --qt \
   --flag=foo:1:qt-format --flag=gettext:1:pass-qt-format \
   --keyword=tr:1,1t --keyword=tr:1,2c,2t --keyword=tr:1,1,2c,3t \
-  xg-c-13.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po || exit 1
+  xg-c-13.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po || Exit 1
 
 cat <<EOF > xg-c-13.ok
 #, qt-format
diff --git a/gettext-tools/tests/xgettext-c-14 b/gettext-tools/tests/xgettext-c-14
index 2cb5a5c..498d07c 100755
--- a/gettext-tools/tests/xgettext-c-14
+++ b/gettext-tools/tests/xgettext-c-14
@@ -17,8 +17,8 @@ gettext("heuristic %1% on, %2% off");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-14.tmp --boost xg-c-14.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-c-14.tmp --boost xg-c-14.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po || Exit 1
 
 # The first 4 are not marked as c-format, because they are known as
 # boost-format. The last 4 are governed by the heuristic. The first two
diff --git a/gettext-tools/tests/xgettext-c-15 b/gettext-tools/tests/xgettext-c-15
index 5d86818..97c41b3 100755
--- a/gettext-tools/tests/xgettext-c-15
+++ b/gettext-tools/tests/xgettext-c-15
@@ -13,8 +13,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location \
   --keyword=Q_:1g --keyword=Q_:1g,2g \
-  -d xg-c-15.tmp xg-c-15.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po || exit 1
+  -d xg-c-15.tmp xg-c-15.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po || Exit 1
 
 cat <<EOF > xg-c-15.ok
 msgctxt "Printer"
diff --git a/gettext-tools/tests/xgettext-c-16 b/gettext-tools/tests/xgettext-c-16
index a594492..9633ead 100755
--- a/gettext-tools/tests/xgettext-c-16
+++ b/gettext-tools/tests/xgettext-c-16
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-c-16.tmp xg-c-16.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-16.tmp.po > xg-c-16.po || exit 1
+  -d xg-c-16.tmp xg-c-16.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-16.tmp.po > xg-c-16.po || Exit 1
 
 cat <<EOF > xg-c-16.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-c-17 b/gettext-tools/tests/xgettext-c-17
index 0789c04..ec81476 100755
--- a/gettext-tools/tests/xgettext-c-17
+++ b/gettext-tools/tests/xgettext-c-17
@@ -16,8 +16,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location -d xg-c-17.tmp --language=C++ --kde \
-  xg-c-17.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po || exit 1
+  xg-c-17.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po || Exit 1
 
 cat <<EOF > xg-c-17.ok
 #, c-format, kde-format
diff --git a/gettext-tools/tests/xgettext-c-18 b/gettext-tools/tests/xgettext-c-18
index deac1f0..6efb217 100755
--- a/gettext-tools/tests/xgettext-c-18
+++ b/gettext-tools/tests/xgettext-c-18
@@ -12,8 +12,8 @@ if (days > 7 && days < 14)
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-18.tmp xg-c-18.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-18.tmp.po > xg-c-18.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-c-18.tmp xg-c-18.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-18.tmp.po > xg-c-18.po || Exit 1
 
 cat <<EOF > xg-c-18.ok
 #, c-format, range: 1..6
diff --git a/gettext-tools/tests/xgettext-c-19 b/gettext-tools/tests/xgettext-c-19
index 674af4f..628ecb8 100755
--- a/gettext-tools/tests/xgettext-c-19
+++ b/gettext-tools/tests/xgettext-c-19
@@ -11,7 +11,7 @@ cat <<\EOF > err1.c
 gettext ("\U00110000");
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.c 2>&1; exit) | grep 'invalid Unicode character' || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.c 2>&1; exit) | grep 'invalid Unicode character' || Exit 1
 
 cat <<\EOF > xg-c-19.in.c
 /* 最��コメント */
@@ -29,12 +29,12 @@ EOF
 
 : ${ICONV=iconv}
 iconv -f UTF-8 -t EUC-JP < xg-c-19.in.c > xg-c-19.c \
-  || { echo "Skipping test: iconv does not work for EUC-JP"; exit 77; }
+  || { echo "Skipping test: iconv does not work for EUC-JP"; Exit 77; }
 
 ${XGETTEXT} --from-code=EUC-JP --add-comments --no-location --no-wrap \
 	    -o - xg-c-19.c | grep -v 'POT-Creation-Date' > xg-c-19.tmp.po \
-	    || exit 1
-LC_ALL=C tr -d '\r' < xg-c-19.tmp.po > xg-c-19.po || exit 1
+	    || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-19.tmp.po > xg-c-19.po || Exit 1
 
 cat <<\EOF > xg-c-19.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-c-2 b/gettext-tools/tests/xgettext-c-2
index 0c53be8..c90786d 100755
--- a/gettext-tools/tests/xgettext-c-2
+++ b/gettext-tools/tests/xgettext-c-2
@@ -24,8 +24,8 @@ _("after double")
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-c-2.tmp -k_ --omit-header --no-location xg-c-2.in.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po || exit 1
+${XGETTEXT} -d xg-c-2.tmp -k_ --omit-header --no-location xg-c-2.in.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po || Exit 1
 
 cat <<EOF > xg-c-2.ok
 #, no-c-format
diff --git a/gettext-tools/tests/xgettext-c-20 b/gettext-tools/tests/xgettext-c-20
index 283f8d0..cfbc345 100755
--- a/gettext-tools/tests/xgettext-c-20
+++ b/gettext-tools/tests/xgettext-c-20
@@ -11,7 +11,7 @@ bbb
 )ccc");
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err0.cc 2>&1; exit) | grep 'unterminated string literal' || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err0.cc 2>&1; exit) | grep 'unterminated string literal' || Exit 1
 
 cat <<\EOF > err1.cc
 gettext (R"aaa(
@@ -19,7 +19,7 @@ bbb
 )ccc");
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.cc 2>&1; exit) | grep 'unterminated string literal' || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.cc 2>&1; exit) | grep 'unterminated string literal' || Exit 1
 
 cat <<\EOF > xg-c-20.cc
 #define X ""
@@ -80,8 +80,8 @@ EOF
 
 ${XGETTEXT} --add-comments --no-location --no-wrap \
 	    -o - xg-c-20.cc | grep -v 'POT-Creation-Date' > xg-c-20.tmp.po \
-	    || exit 1
-LC_ALL=C tr -d '\r' < xg-c-20.tmp.po > xg-c-20.po || exit 1
+	    || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-20.tmp.po > xg-c-20.po || Exit 1
 
 cat <<\EOF > xg-c-20.ok
 # SOME DESCRIPTIVE TITLE.
@@ -123,7 +123,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-c-20.ok xg-c-20.po || exit 1
+${DIFF} xg-c-20.ok xg-c-20.po || Exit 1
 
 cat <<\EOF > xg-c-20.c
 gettext (R"aaa(This is NOT a raw string");
@@ -135,8 +135,8 @@ EOF
 
 ${XGETTEXT} --add-comments --no-location --no-wrap \
 	    -o - xg-c-20.c | grep -v 'POT-Creation-Date' > xg-c-20c.tmp.po \
-	    || exit 1
-LC_ALL=C tr -d '\r' < xg-c-20c.tmp.po > xg-c-20c.po || exit 1
+	    || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-20c.tmp.po > xg-c-20c.po || Exit 1
 
 cat <<\EOF > xg-c-20c.ok
 # SOME DESCRIPTIVE TITLE.
@@ -161,4 +161,4 @@ msgid "aaa(This is NOT a raw string"
 msgstr ""
 EOF
 
-${DIFF} xg-c-20c.ok xg-c-20c.po || exit 1
+${DIFF} xg-c-20c.ok xg-c-20c.po || Exit 1
diff --git a/gettext-tools/tests/xgettext-c-21 b/gettext-tools/tests/xgettext-c-21
index 4fdcfe9..c96b3c9 100755
--- a/gettext-tools/tests/xgettext-c-21
+++ b/gettext-tools/tests/xgettext-c-21
@@ -7,8 +7,8 @@
 
 ${XGETTEXT} --add-comments --no-location --no-wrap \
 	    -o - "$abs_srcdir"/xg-c-21.c \
-  | grep -v 'POT-Creation-Date' > xg-c-21.tmp.po || exit 1
-LC_ALL=C tr -d '\r' < xg-c-21.tmp.po > xg-c-21.po || exit 1
+  | grep -v 'POT-Creation-Date' > xg-c-21.tmp.po || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-21.tmp.po > xg-c-21.po || Exit 1
 
 cat <<\EOF > xg-c-21.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-c-3 b/gettext-tools/tests/xgettext-c-3
index d522457..c06c056 100755
--- a/gettext-tools/tests/xgettext-c-3
+++ b/gettext-tools/tests/xgettext-c-3
@@ -11,8 +11,8 @@ gettext("nothing");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-location -d xg-c-3.tmp xg-c-3.in.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po || exit 1
+${XGETTEXT} --omit-header --add-location -d xg-c-3.tmp xg-c-3.in.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po || Exit 1
 
 cat <<EOF > xg-c-3.ok
 #: bozo:42
diff --git a/gettext-tools/tests/xgettext-c-4 b/gettext-tools/tests/xgettext-c-4
index 7db3e35..9f2b1c5 100755
--- a/gettext-tools/tests/xgettext-c-4
+++ b/gettext-tools/tests/xgettext-c-4
@@ -8,8 +8,8 @@ main()??<printf(gettext("Hello, " "World!" "??/n"));return 0 ? a??(0??'1??) : 1?
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4.tmp xg-c-4.in.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po || exit 1
+${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4.tmp xg-c-4.in.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po || Exit 1
 
 cat <<EOF > xg-c-4.ok
 #, c-format
diff --git a/gettext-tools/tests/xgettext-c-5 b/gettext-tools/tests/xgettext-c-5
index 14c90fe..ffe142a 100755
--- a/gettext-tools/tests/xgettext-c-5
+++ b/gettext-tools/tests/xgettext-c-5
@@ -8,8 +8,8 @@ main(){printf(gettext/*puke*/(/*barf*/"Hello, " "World!" "\n")); }
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-5.tmp xg-c-5.in.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po || exit 1
+${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-5.tmp xg-c-5.in.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po || Exit 1
 
 cat <<EOF > xg-c-5.ok
 #. puke
diff --git a/gettext-tools/tests/xgettext-c-6 b/gettext-tools/tests/xgettext-c-6
index 3d839aa..333d756 100755
--- a/gettext-tools/tests/xgettext-c-6
+++ b/gettext-tools/tests/xgettext-c-6
@@ -19,8 +19,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=XXX \
-  -d xg-c-6.tmp xg-c-6.in.C || exit 1
-LC_ALL=C tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po || exit 1
+  -d xg-c-6.tmp xg-c-6.in.C || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po || Exit 1
 
 cat <<EOF > xg-c-6.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-c-7 b/gettext-tools/tests/xgettext-c-7
index 248bfa9..4192030 100755
--- a/gettext-tools/tests/xgettext-c-7
+++ b/gettext-tools/tests/xgettext-c-7
@@ -38,8 +38,8 @@ main()
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-7.tmp xg-c-7.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po || exit 1
+${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-7.tmp xg-c-7.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po || Exit 1
 
 cat <<EOF > xg-c-7.ok
 #. This is a comment which immediately before a keyword.
diff --git a/gettext-tools/tests/xgettext-c-8 b/gettext-tools/tests/xgettext-c-8
index 48f160c..c764f7a 100755
--- a/gettext-tools/tests/xgettext-c-8
+++ b/gettext-tools/tests/xgettext-c-8
@@ -14,8 +14,8 @@ void foo ()
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -k_ -o xg-c-8.tmp xg-c-8.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-8.tmp > xg-c-8.po || exit 1
+${XGETTEXT} --omit-header --no-location -k_ -o xg-c-8.tmp xg-c-8.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-8.tmp > xg-c-8.po || Exit 1
 
 cat <<EOF > xg-c-8.ok
 #, c-format
diff --git a/gettext-tools/tests/xgettext-c-9 b/gettext-tools/tests/xgettext-c-9
index 340e88a..a8be451 100755
--- a/gettext-tools/tests/xgettext-c-9
+++ b/gettext-tools/tests/xgettext-c-9
@@ -22,8 +22,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-c-9.tmp xg-c-9.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po || exit 1
+  -d xg-c-9.tmp xg-c-9.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po || Exit 1
 
 cat <<EOF > xg-c-9.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-csharp-1 b/gettext-tools/tests/xgettext-csharp-1
index a7a77e9..cbb3c32 100755
--- a/gettext-tools/tests/xgettext-csharp-1
+++ b/gettext-tools/tests/xgettext-csharp-1
@@ -31,8 +31,8 @@ third line");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c -d xg-cs-1.tmp xg-cs-1.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po || exit 1
+${XGETTEXT} --omit-header --no-location -c -d xg-cs-1.tmp xg-cs-1.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po || Exit 1
 
 cat <<EOF > xg-cs-1.ok
 #. standard usage
diff --git a/gettext-tools/tests/xgettext-csharp-2 b/gettext-tools/tests/xgettext-csharp-2
index cf8d4a2..934af53 100755
--- a/gettext-tools/tests/xgettext-csharp-2
+++ b/gettext-tools/tests/xgettext-csharp-2
@@ -29,7 +29,7 @@ EOF
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --add-location -c --from-code=UTF-8 xg-cs-2.cs \
-  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-2.po || exit 1
+  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-2.po || Exit 1
 
 cat <<\EOF > xg-cs-2.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-csharp-3 b/gettext-tools/tests/xgettext-csharp-3
index 30d9a9b..0e91e94 100755
--- a/gettext-tools/tests/xgettext-csharp-3
+++ b/gettext-tools/tests/xgettext-csharp-3
@@ -51,7 +51,7 @@ EOF
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --add-location -c -kMyGetString:2 xg-cs-3.cs 2>/dev/null \
-  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-3.po || exit 1
+  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-3.po || Exit 1
 
 cat <<\EOF > xg-cs-3.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-csharp-4 b/gettext-tools/tests/xgettext-csharp-4
index 5cca144..1fc2ef0 100755
--- a/gettext-tools/tests/xgettext-csharp-4
+++ b/gettext-tools/tests/xgettext-csharp-4
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --keyword=MyPluralString:2,3 \
-  -d xg-cs-4.tmp xg-cs-4.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po || exit 1
+  -d xg-cs-4.tmp xg-cs-4.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po || Exit 1
 
 cat <<EOF > xg-cs-4.ok
 msgid "test 1"
diff --git a/gettext-tools/tests/xgettext-csharp-5 b/gettext-tools/tests/xgettext-csharp-5
index 7584a16..2d6b0c4 100755
--- a/gettext-tools/tests/xgettext-csharp-5
+++ b/gettext-tools/tests/xgettext-csharp-5
@@ -22,8 +22,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-cs-5.tmp xg-cs-5.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po || exit 1
+  -d xg-cs-5.tmp xg-cs-5.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po || Exit 1
 
 cat <<EOF > xg-cs-5.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-csharp-6 b/gettext-tools/tests/xgettext-csharp-6
index 390c620..83cf7e5 100755
--- a/gettext-tools/tests/xgettext-csharp-6
+++ b/gettext-tools/tests/xgettext-csharp-6
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-cs-6.tmp xg-cs-6.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po || exit 1
+  -d xg-cs-6.tmp xg-cs-6.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po || Exit 1
 
 cat <<EOF > xg-cs-6.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-csharp-7 b/gettext-tools/tests/xgettext-csharp-7
index 9f5643b..6cb31f2 100755
--- a/gettext-tools/tests/xgettext-csharp-7
+++ b/gettext-tools/tests/xgettext-csharp-7
@@ -9,8 +9,8 @@ Console.WriteLine(rm.GetParticularString("Help", "about"));
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-cs-7.tmp xg-cs-7.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-cs-7.tmp xg-cs-7.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po || Exit 1
 
 cat <<EOF > xg-cs-7.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-csharp-8 b/gettext-tools/tests/xgettext-csharp-8
index f5e5694..5b43f11 100755
--- a/gettext-tools/tests/xgettext-csharp-8
+++ b/gettext-tools/tests/xgettext-csharp-8
@@ -21,7 +21,7 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --output - --add-location xg-cs-8.cs -a 2>/dev/null | \
   sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-8.po || \
-  exit 1
+  Exit 1
 
 cat <<\EOF > xg-cs-8.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-desktop-1 b/gettext-tools/tests/xgettext-desktop-1
index c6f9df1..212043f 100755
--- a/gettext-tools/tests/xgettext-desktop-1
+++ b/gettext-tools/tests/xgettext-desktop-1
@@ -11,33 +11,33 @@ This is an invalid line
 Name =Foo
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err1.desktop 2>&1; exit) | grep "missing '=' after" || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err1.desktop 2>&1; exit) | grep "missing '=' after" || Exit 1
 
 cat <<\EOF >err2.desktop
 [Desktop Entry
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err2.desktop 2>&1; exit) | grep "unterminated group name" || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err2.desktop 2>&1; exit) | grep "unterminated group name" || Exit 1
 
 cat <<\EOF >err3.desktop
 [Desktop Entry]
   Not a blank line!
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err3.desktop 2>&1; exit) | grep "invalid non-blank line" || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err3.desktop 2>&1; exit) | grep "invalid non-blank line" || Exit 1
 
 cat <<\EOF >err4.desktop
 [Desktop Entry]a
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err4.desktop 2>&1; exit) | grep "invalid non-blank character" || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err4.desktop 2>&1; exit) | grep "invalid non-blank character" || Exit 1
 
 # gettext 0.19.4 issued an baseless warning of this.
 cat <<\EOF >ok4.desktop
 [Desktop Entry]
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - ok4.desktop 2>&1; exit) | grep "invalid non-blank character" && exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - ok4.desktop 2>&1; exit) | grep "invalid non-blank character" && Exit 1
 
 cat <<\EOF > xg.desktop
 [Desktop Entry]
@@ -53,7 +53,7 @@ X-Foo = bar
 Keywords=Keyword1;Keyword2;Key\;word3;
 EOF
 
-${XGETTEXT} --add-comments -o - xg.desktop | grep -v 'POT-Creation-Date' > xg-desktop.pot || exit 1
+${XGETTEXT} --add-comments -o - xg.desktop | grep -v 'POT-Creation-Date' > xg-desktop.pot || Exit 1
 
 cat <<\EOF > xg-desktop.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-elisp-1 b/gettext-tools/tests/xgettext-elisp-1
index 7d73dbb..ccb75bc 100755
--- a/gettext-tools/tests/xgettext-elisp-1
+++ b/gettext-tools/tests/xgettext-elisp-1
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-el-1.tmp xg-el-1.el || exit 1
-LC_ALL=C tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po || exit 1
+  -d xg-el-1.tmp xg-el-1.el || Exit 1
+LC_ALL=C tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po || Exit 1
 
 cat <<EOF > xg-el-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-elisp-2 b/gettext-tools/tests/xgettext-elisp-2
index 22c472e..e67811d 100755
--- a/gettext-tools/tests/xgettext-elisp-2
+++ b/gettext-tools/tests/xgettext-elisp-2
@@ -15,8 +15,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-el-2.tmp xg-el-2.el || exit 1
-LC_ALL=C tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po || exit 1
+  -d xg-el-2.tmp xg-el-2.el || Exit 1
+LC_ALL=C tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po || Exit 1
 
 cat <<EOF > xg-el-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-glade-1 b/gettext-tools/tests/xgettext-glade-1
index 3fd95f3..b31b3e1 100755
--- a/gettext-tools/tests/xgettext-glade-1
+++ b/gettext-tools/tests/xgettext-glade-1
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gl-1.pot xg-gl-1-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-1-widgets.glade
@@ -1330,7 +1330,7 @@ for said code in libglade.</text>
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o - xg-gl-1-widgets.glade | grep -v 'POT-Creation-Date' > xg-gl-1.pot || exit 1
+${XGETTEXT} --add-comments -o - xg-gl-1-widgets.glade | grep -v 'POT-Creation-Date' > xg-gl-1.pot || Exit 1
 
 cat <<EOF > xg-gl-1.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-glade-2 b/gettext-tools/tests/xgettext-glade-2
index 7b3fb0f..a5e9558 100755
--- a/gettext-tools/tests/xgettext-glade-2
+++ b/gettext-tools/tests/xgettext-glade-2
@@ -13,7 +13,7 @@ EOF
 ${XGETTEXT} -o xg-gl-2.pot xg-gl-2-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > xg-gl-2-simple.glade
@@ -55,7 +55,7 @@ cat <<\EOF > xg-gl-2-simple.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o xg-gl-2.tmp xg-gl-2-simple.glade  || exit 1
+${XGETTEXT} --add-comments -o xg-gl-2.tmp xg-gl-2-simple.glade  || Exit 1
 # Don't simplify this to "grep ... < xg-gl-2.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-2.tmp | grep -v 'POT-Creation-Date' > xg-gl-2.pot
diff --git a/gettext-tools/tests/xgettext-glade-3 b/gettext-tools/tests/xgettext-glade-3
index 38010fb..909179f 100755
--- a/gettext-tools/tests/xgettext-glade-3
+++ b/gettext-tools/tests/xgettext-glade-3
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gl-3.pot xg-gl-3-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-3-asciitable.glade2
@@ -162,7 +162,7 @@ button or double click the character in the table.</property>
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-3.tmp xg-gl-3-asciitable.glade2  || exit 1
+${XGETTEXT} -o xg-gl-3.tmp xg-gl-3-asciitable.glade2  || Exit 1
 # Don't simplify this to "grep ... < xg-gl-3.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-3.tmp | grep -v 'POT-Creation-Date' > xg-gl-3.pot
diff --git a/gettext-tools/tests/xgettext-glade-4 b/gettext-tools/tests/xgettext-glade-4
index e753450..d66a0f7 100755
--- a/gettext-tools/tests/xgettext-glade-4
+++ b/gettext-tools/tests/xgettext-glade-4
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gl-4.pot xg-gl-4-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-4.glade
@@ -35,7 +35,7 @@ cat <<EOF > xg-gl-4.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-4.tmp xg-gl-4.glade || exit 1
+${XGETTEXT} -o xg-gl-4.tmp xg-gl-4.glade || Exit 1
 # Don't simplify this to "grep ... < xg-gl-4.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-4.tmp | grep -v 'POT-Creation-Date' > xg-gl-4.pot
@@ -90,7 +90,7 @@ cat <<EOF > xg-gl-4a.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-4a.tmp xg-gl-4a.glade || exit 1
+${XGETTEXT} -o xg-gl-4a.tmp xg-gl-4a.glade || Exit 1
 # Look upwards
 cat xg-gl-4a.tmp | grep -v 'POT-Creation-Date' > xg-gl-4a.pot
 
diff --git a/gettext-tools/tests/xgettext-glade-5 b/gettext-tools/tests/xgettext-glade-5
index 3877808..2ce6132 100755
--- a/gettext-tools/tests/xgettext-glade-5
+++ b/gettext-tools/tests/xgettext-glade-5
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gl-5.pot xg-gl-5-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-5.glade
@@ -54,7 +54,7 @@ cat <<EOF > xg-gl-5.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-5.tmp xg-gl-5.glade || exit 1
+${XGETTEXT} -o xg-gl-5.tmp xg-gl-5.glade || Exit 1
 # Don't simplify this to "grep ... < xg-gl-5.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-5.tmp | grep -v 'POT-Creation-Date' > xg-gl-5.pot
@@ -98,7 +98,7 @@ test $result = 0 || {
 
 # Check with --extract-all option
 rm xg-gl-5.tmp
-${XGETTEXT} -a -o xg-gl-5.tmp xg-gl-5.glade || exit 1
+${XGETTEXT} -a -o xg-gl-5.tmp xg-gl-5.glade || Exit 1
 # Don't simplify this to "grep ... < xg-gl-5.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-5.tmp | grep -v 'POT-Creation-Date' > xg-gl-5.pot
@@ -149,7 +149,7 @@ cat <<EOF > xg-gl-5b.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-5b.tmp xg-gl-5b.glade 2>/dev/null || exit 1
+${XGETTEXT} -o xg-gl-5b.tmp xg-gl-5b.glade 2>/dev/null || Exit 1
 # Don't simplify this to "grep ... < xg-gl-5b.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-5b.tmp | grep -v 'POT-Creation-Date' > xg-gl-5b.pot
diff --git a/gettext-tools/tests/xgettext-glade-6 b/gettext-tools/tests/xgettext-glade-6
index 49fecf8..e195cdc 100755
--- a/gettext-tools/tests/xgettext-glade-6
+++ b/gettext-tools/tests/xgettext-glade-6
@@ -14,7 +14,7 @@ EOF
 ${XGETTEXT} -o xg-gl-6.pot xg-gl-6-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-6.ui
@@ -32,7 +32,7 @@ cat <<EOF > xg-gl-6.ui
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || exit 1
+${XGETTEXT} -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || Exit 1
 
 cat <<EOF > xg-gl-6.ok
 # SOME DESCRIPTIVE TITLE.
@@ -69,7 +69,7 @@ test $result = 0 || {
 }
 
 # Check with --extract-all option.
-${XGETTEXT} -a -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || exit 1
+${XGETTEXT} -a -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || Exit 1
 
 # Must be ignored.
 ${DIFF} xg-gl-6.ok xg-gl-6.pot
diff --git a/gettext-tools/tests/xgettext-glade-7 b/gettext-tools/tests/xgettext-glade-7
index d037415..8a559d7 100755
--- a/gettext-tools/tests/xgettext-glade-7
+++ b/gettext-tools/tests/xgettext-glade-7
@@ -14,7 +14,7 @@ EOF
 ${XGETTEXT} -o xg-gl-7.pot xg-gl-7-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-7.ui
@@ -184,7 +184,7 @@ cat <<EOF > xg-gl-7.ui
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o - xg-gl-7.ui | grep -v 'POT-Creation-Date' > xg-gl-7.pot || exit 1
+${XGETTEXT} -o - xg-gl-7.ui | grep -v 'POT-Creation-Date' > xg-gl-7.pot || Exit 1
 
 cat <<\EOF > xg-gl-7.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-gsettings-1 b/gettext-tools/tests/xgettext-gsettings-1
index 387f476..75fc725 100755
--- a/gettext-tools/tests/xgettext-gsettings-1
+++ b/gettext-tools/tests/xgettext-gsettings-1
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gs-1.pot xg-gs-1-empty.gschema.xml 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without GSettings support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gs-1.gschema.xml
@@ -43,7 +43,7 @@ cat <<EOF > xg-gs-1.gschema.xml
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o - xg-gs-1.gschema.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot || exit 1
+${XGETTEXT} --add-comments -o - xg-gs-1.gschema.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot || Exit 1
 
 cat <<EOF > xg-gs-1.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-its-1 b/gettext-tools/tests/xgettext-its-1
index 9e3cac5..b77d5b1 100755
--- a/gettext-tools/tests/xgettext-its-1
+++ b/gettext-tools/tests/xgettext-its-1
@@ -13,7 +13,7 @@ cat <<\EOF > empty.xml
 <empty></empty>
 EOF
 
-${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; exit 1; }
+${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; Exit 1; }
 
 test -d its || mkdir its
 
@@ -22,7 +22,7 @@ cat <<\EOF > its/empty-1.loc
 <locatingRules/>
 EOF
 
-${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; exit 1; }
+${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; Exit 1; }
 
 cat <<\EOF > its/empty-2.loc
 <?xml version="1.0"?>
@@ -33,7 +33,7 @@ cat <<\EOF > its/empty-2.loc
 </locatingRules>
 EOF
 
-${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; exit 1; }
+${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; Exit 1; }
 
 cat <<\EOF > its/empty.its
 <?xml version="1.0"?>
@@ -41,7 +41,7 @@ cat <<\EOF > its/empty.its
 </its:rules>
 EOF
 
-${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; exit 1; }
+${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; Exit 1; }
 
 cat <<\EOF > its/messages.loc
 <?xml version="1.0"?>
@@ -251,7 +251,7 @@ EOF
 
 : ${DIFF=diff}
 
-${XGETTEXT} --itstool --no-wrap --omit-header -o messages.pot messages.xml 2>messages.err || { cat messages.err; exit 1; }
+${XGETTEXT} --itstool --no-wrap --omit-header -o messages.pot messages.xml 2>messages.err || { cat messages.err; Exit 1; }
 ${DIFF} messages.ok messages.pot
 result=$?
 test $result = 0 || exit $result
@@ -267,7 +267,7 @@ cd po
 GETTEXTDATADIR=..
 export GETTEXTDATADIR
 
-${XGETTEXT} --itstool --no-wrap --omit-header --directory=.. -o messages.pot.in data/messages.msg.in 2>messages.err || { cat messages.err; exit 1; }
+${XGETTEXT} --itstool --no-wrap --omit-header --directory=.. -o messages.pot.in data/messages.msg.in 2>messages.err || { cat messages.err; Exit 1; }
 sed -e 's!^#: data/messages.msg.in!#: messages.xml!' \
   < messages.pot.in > messages.pot
 
diff --git a/gettext-tools/tests/xgettext-its-2 b/gettext-tools/tests/xgettext-its-2
new file mode 100755
index 0000000..674a141
--- /dev/null
+++ b/gettext-tools/tests/xgettext-its-2
@@ -0,0 +1,62 @@
+#!/bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
+
+# Test of ITS search path.
+
+for d in a b c xa xb xc; do
+  test -d "$d" || mkdir "$d"
+  base="$d"
+  if expr "$d" : x 2>&1 >/dev/null; then
+    test -d "$d/gettext" || mkdir "$d/gettext"
+    base="$d/gettext"
+  fi
+  test -d "$base/its" || mkdir "$base/its"
+  cat <<EOF > "$base/its/$d.loc"
+<?xml version='1.0'?>
+<locatingRules>
+  <locatingRule pattern='*.$d'>
+    <documentRule prefix='' localName='$d' target='empty.its'/>
+  </locatingRule>
+</locatingRules>
+EOF
+  cat <<EOF > "$base/its/empty.its"
+<?xml version='1.0'?>
+<its:rules xmlns:its='http://www.w3.org/2005/11/its' version='1.0'>
+</its:rules>
+EOF
+  cat <<EOF > "input.$d"
+<?xml version='1.0'?>
+<$d>
+</$d>
+EOF
+done
+
+: ${XGETTEXT=xgettext}
+
+unset GETTEXTDATADIR
+unset GETTEXTDATADIRS
+unset XDG_DATA_DIRS
+
+${XGETTEXT} -o /dev/null input.a 2>&1 | grep 'is unknown; will try C' 2>&1 >/dev/null
+result=$?
+test $result = 0 || Exit 1
+
+GETTEXTDATADIR=a
+export GETTEXTDATADIR
+${XGETTEXT} -o /dev/null input.a 2>&1 | grep 'is unknown; will try C' 2>&1 >/dev/null
+result=$?
+test $result = 0 && Exit 1
+
+GETTEXTDATADIRS=b:a
+export GETTEXTDATADIRS
+${XGETTEXT} -o /dev/null input.b 2>&1 | grep 'is unknown; will try C' 2>&1 >/dev/null
+result=$?
+test $result = 0 && Exit 1
+
+XDG_DATA_DIRS=xa
+export XDG_DATA_DIRS
+${XGETTEXT} -o /dev/null input.xa 2>&1 | grep 'is unknown; will try C' 2>&1 >/dev/null
+result=$?
+test $result = 0 && Exit 1
+
+Exit 0
diff --git a/gettext-tools/tests/xgettext-java-1 b/gettext-tools/tests/xgettext-java-1
index 2d73c22..53fb5ee 100755
--- a/gettext-tools/tests/xgettext-java-1
+++ b/gettext-tools/tests/xgettext-java-1
@@ -29,8 +29,8 @@ class TestCase {
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c -d xg-j-1.tmp xg-j-1.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po || exit 1
+${XGETTEXT} --omit-header --no-location -c -d xg-j-1.tmp xg-j-1.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po || Exit 1
 
 cat <<EOF > xg-j-1.ok
 #. standard usage
diff --git a/gettext-tools/tests/xgettext-java-2 b/gettext-tools/tests/xgettext-java-2
index 6cdce99..5f20864 100755
--- a/gettext-tools/tests/xgettext-java-2
+++ b/gettext-tools/tests/xgettext-java-2
@@ -56,7 +56,7 @@ comment! */ "this is a single " /* now comes the concatenation! */ + // after +
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-j-2.tmp xg-j-2.java 2>/dev/null || exit 1
+${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-j-2.tmp xg-j-2.java 2>/dev/null || Exit 1
 # Don't simplify this to "grep ... < xg-j-2.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-j-2.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-j-2.pot
diff --git a/gettext-tools/tests/xgettext-java-3 b/gettext-tools/tests/xgettext-java-3
index f288b15..b10ccaa 100755
--- a/gettext-tools/tests/xgettext-java-3
+++ b/gettext-tools/tests/xgettext-java-3
@@ -14,8 +14,8 @@ class TestCase {
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-j-3.tmp xg-j-3.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-j-3.tmp xg-j-3.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po || Exit 1
 
 cat <<EOF > xg-j-3.ok
 msgid "test 1"
diff --git a/gettext-tools/tests/xgettext-java-4 b/gettext-tools/tests/xgettext-java-4
index f77f8ee..321eada 100755
--- a/gettext-tools/tests/xgettext-java-4
+++ b/gettext-tools/tests/xgettext-java-4
@@ -15,8 +15,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 \
-  -d xg-j-4.tmp xg-j-4.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po || exit 1
+  -d xg-j-4.tmp xg-j-4.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po || Exit 1
 
 cat <<EOF > xg-j-4.ok
 msgid "test 1"
diff --git a/gettext-tools/tests/xgettext-java-5 b/gettext-tools/tests/xgettext-java-5
index 882b0e1..bd9587f 100755
--- a/gettext-tools/tests/xgettext-java-5
+++ b/gettext-tools/tests/xgettext-java-5
@@ -22,8 +22,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-j-5.tmp xg-j-5.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po || exit 1
+  -d xg-j-5.tmp xg-j-5.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po || Exit 1
 
 cat <<EOF > xg-j-5.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-java-6 b/gettext-tools/tests/xgettext-java-6
index e8f458d..066cfca 100755
--- a/gettext-tools/tests/xgettext-java-6
+++ b/gettext-tools/tests/xgettext-java-6
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-j-6.tmp xg-j-6.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po || exit 1
+  -d xg-j-6.tmp xg-j-6.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po || Exit 1
 
 cat <<EOF > xg-j-6.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-java-7 b/gettext-tools/tests/xgettext-java-7
index bf3f933..b61680c 100755
--- a/gettext-tools/tests/xgettext-java-7
+++ b/gettext-tools/tests/xgettext-java-7
@@ -10,8 +10,8 @@ System.out.println(GettextResourceBundle.pgettext("Help", "about"));
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-j-7.tmp xg-j-7.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-j-7.tmp xg-j-7.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po || Exit 1
 
 cat <<EOF > xg-j-7.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-javascript-1 b/gettext-tools/tests/xgettext-javascript-1
index 198c30e..d4a3bf6 100755
--- a/gettext-tools/tests/xgettext-javascript-1
+++ b/gettext-tools/tests/xgettext-javascript-1
@@ -20,7 +20,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location -o xg-js-1.tmp xg-js-1.js 2>xg-js-1.err
-test $? = 0 || { cat xg-js-1.err; exit 1; }
+test $? = 0 || { cat xg-js-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-1.pot
diff --git a/gettext-tools/tests/xgettext-javascript-2 b/gettext-tools/tests/xgettext-javascript-2
index 3f6e6d4..b7c266a 100755
--- a/gettext-tools/tests/xgettext-javascript-2
+++ b/gettext-tools/tests/xgettext-javascript-2
@@ -32,7 +32,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-js-2.tmp xg-js-2.js 2>xg-js-2.err
-test $? = 0 || { cat xg-js-2.err; exit 1; }
+test $? = 0 || { cat xg-js-2.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-2.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-2.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-2.pot
diff --git a/gettext-tools/tests/xgettext-javascript-3 b/gettext-tools/tests/xgettext-javascript-3
index b37b5a5..ed1f30d 100755
--- a/gettext-tools/tests/xgettext-javascript-3
+++ b/gettext-tools/tests/xgettext-javascript-3
@@ -15,7 +15,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location -o xg-js-3.tmp xg-js-3.js 2>xg-js-3.err
-test $? = 0 || { cat xg-js-3.err; exit 1; }
+test $? = 0 || { cat xg-js-3.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-3.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-3.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-3.pot
diff --git a/gettext-tools/tests/xgettext-javascript-4 b/gettext-tools/tests/xgettext-javascript-4
index 399b97d..5932f6c 100755
--- a/gettext-tools/tests/xgettext-javascript-4
+++ b/gettext-tools/tests/xgettext-javascript-4
@@ -11,7 +11,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-js-4.tmp xg-js-4.js 2>xg-js-4.err
-test $? = 0 || { cat xg-js-4.err; exit 1; }
+test $? = 0 || { cat xg-js-4.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-4.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-4.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-4.pot
diff --git a/gettext-tools/tests/xgettext-javascript-5 b/gettext-tools/tests/xgettext-javascript-5
index 1fd08b5..7baa47d 100755
--- a/gettext-tools/tests/xgettext-javascript-5
+++ b/gettext-tools/tests/xgettext-javascript-5
@@ -27,7 +27,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-js-5.tmp xg-js-5.js 2>xg-js-5.err
-test $? = 0 || { cat xg-js-5.err; exit 1; }
+test $? = 0 || { cat xg-js-5.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-5.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-5.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-5.pot
diff --git a/gettext-tools/tests/xgettext-javascript-6 b/gettext-tools/tests/xgettext-javascript-6
index 1057d33..375e377 100755
--- a/gettext-tools/tests/xgettext-javascript-6
+++ b/gettext-tools/tests/xgettext-javascript-6
@@ -30,7 +30,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-js-6.tmp xg-js-6.js 2>xg-js-6.err
-test $? = 0 || { cat xg-js-6.err; exit 1; }
+test $? = 0 || { cat xg-js-6.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-6.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-6.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-6.pot
diff --git a/gettext-tools/tests/xgettext-librep-1 b/gettext-tools/tests/xgettext-librep-1
index 9463baa..fa89f94 100755
--- a/gettext-tools/tests/xgettext-librep-1
+++ b/gettext-tools/tests/xgettext-librep-1
@@ -18,8 +18,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-lr-1.tmp xg-lr-1.jl || exit 1
-LC_ALL=C tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po || exit 1
+  -d xg-lr-1.tmp xg-lr-1.jl || Exit 1
+LC_ALL=C tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po || Exit 1
 
 cat <<EOF > xg-lr-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-librep-2 b/gettext-tools/tests/xgettext-librep-2
index f4dc918..7397a08 100755
--- a/gettext-tools/tests/xgettext-librep-2
+++ b/gettext-tools/tests/xgettext-librep-2
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-lr-2.tmp xg-lr-2.jl || exit 1
-LC_ALL=C tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po || exit 1
+  -d xg-lr-2.tmp xg-lr-2.jl || Exit 1
+LC_ALL=C tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po || Exit 1
 
 cat <<EOF > xg-lr-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-lisp-1 b/gettext-tools/tests/xgettext-lisp-1
index eb83e72..acbf3c5 100755
--- a/gettext-tools/tests/xgettext-lisp-1
+++ b/gettext-tools/tests/xgettext-lisp-1
@@ -18,8 +18,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-ls-1.tmp xg-ls-1.lisp || exit 1
-LC_ALL=C tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po || exit 1
+  -d xg-ls-1.tmp xg-ls-1.lisp || Exit 1
+LC_ALL=C tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po || Exit 1
 
 cat <<EOF > xg-ls-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-lisp-2 b/gettext-tools/tests/xgettext-lisp-2
index 94de068..434336a 100755
--- a/gettext-tools/tests/xgettext-lisp-2
+++ b/gettext-tools/tests/xgettext-lisp-2
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-ls-2.tmp xg-ls-2.lisp || exit 1
-LC_ALL=C tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po || exit 1
+  -d xg-ls-2.tmp xg-ls-2.lisp || Exit 1
+LC_ALL=C tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po || Exit 1
 
 cat <<EOF > xg-ls-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-lua-1 b/gettext-tools/tests/xgettext-lua-1
index 6a764c9..a41c313 100755
--- a/gettext-tools/tests/xgettext-lua-1
+++ b/gettext-tools/tests/xgettext-lua-1
@@ -26,8 +26,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-lu-1.tmp xg-lu-1.lua || exit 1
-LC_ALL=C tr -d '\r' < xg-lu-1.tmp.po > xg-lu-1.po || exit 1
+  -d xg-lu-1.tmp xg-lu-1.lua || Exit 1
+LC_ALL=C tr -d '\r' < xg-lu-1.tmp.po > xg-lu-1.po || Exit 1
 
 cat <<EOF > xg-lu-1.ok
 msgid "This is a test string."
diff --git a/gettext-tools/tests/xgettext-lua-2 b/gettext-tools/tests/xgettext-lua-2
index 797e513..26eac14 100755
--- a/gettext-tools/tests/xgettext-lua-2
+++ b/gettext-tools/tests/xgettext-lua-2
@@ -25,8 +25,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-lu-2.tmp xg-lu-2.lua || exit 1
-LC_ALL=C tr -d '\r' < xg-lu-2.tmp.po > xg-lu-2.po || exit 1
+  -d xg-lu-2.tmp xg-lu-2.lua || Exit 1
+LC_ALL=C tr -d '\r' < xg-lu-2.tmp.po > xg-lu-2.po || Exit 1
 
 cat <<EOF > xg-lu-2.ok
 msgid "Hmm."
diff --git a/gettext-tools/tests/xgettext-objc-1 b/gettext-tools/tests/xgettext-objc-1
index 9563d77..9d34c13 100755
--- a/gettext-tools/tests/xgettext-objc-1
+++ b/gettext-tools/tests/xgettext-objc-1
@@ -26,8 +26,8 @@ NSLocalizedString(@"Information", @"")
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -k_ -kNSLocalizedString -d xg-ob-1.tmp xg-ob-1.m || exit 1
-LC_ALL=C tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po || exit 1
+${XGETTEXT} --omit-header -k_ -kNSLocalizedString -d xg-ob-1.tmp xg-ob-1.m || Exit 1
+LC_ALL=C tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po || Exit 1
 
 cat <<\EOF > xg-ob-1.ok
 #: xg-ob-1.m:2
diff --git a/gettext-tools/tests/xgettext-objc-2 b/gettext-tools/tests/xgettext-objc-2
index a59a3d4..21d174c 100755
--- a/gettext-tools/tests/xgettext-objc-2
+++ b/gettext-tools/tests/xgettext-objc-2
@@ -26,8 +26,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-ob-2.tmp xg-ob-2.m || exit 1
-LC_ALL=C tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po || exit 1
+  -d xg-ob-2.tmp xg-ob-2.m || Exit 1
+LC_ALL=C tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po || Exit 1
 
 cat <<EOF > xg-ob-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-perl-1 b/gettext-tools/tests/xgettext-perl-1
index 5f52c60..1f9c9bf 100755
--- a/gettext-tools/tests/xgettext-perl-1
+++ b/gettext-tools/tests/xgettext-perl-1
@@ -154,8 +154,8 @@ ${XGETTEXT} --omit-header -n \
   -k_ --flag=_:1:pass-perl-format --flag=_:1:pass-perl-brace-format \
   -k%__ --flag=%__:1:pass-perl-format --flag=%__:1:pass-perl-brace-format \
   -k\$__ --flag=\$__:1:pass-perl-format --flag=\$__:1:pass-perl-brace-format \
-  -d xg-pl-1.tmp xg-pl-1.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po || exit 1
+  -d xg-pl-1.tmp xg-pl-1.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po || Exit 1
 
 cat <<\EOF > xg-pl-1.ok
 #: xg-pl-1.pl:9
diff --git a/gettext-tools/tests/xgettext-perl-2 b/gettext-tools/tests/xgettext-perl-2
index 85f0464..e6f2ee7 100755
--- a/gettext-tools/tests/xgettext-perl-2
+++ b/gettext-tools/tests/xgettext-perl-2
@@ -14,7 +14,7 @@ EOF
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --from-code=ISO-8859-1 xg-pl-2.pl \
-  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-2.po || exit 1
+  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-2.po || Exit 1
 
 cat <<\EOF > xg-pl-2.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-perl-3 b/gettext-tools/tests/xgettext-perl-3
index 9852813..01f5a77 100755
--- a/gettext-tools/tests/xgettext-perl-3
+++ b/gettext-tools/tests/xgettext-perl-3
@@ -14,7 +14,7 @@ EOF
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --from-code=UTF-8 xg-pl-3.pl \
-  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-3.po || exit 1
+  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-3.po || Exit 1
 
 cat <<\EOF > xg-pl-3.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-perl-4 b/gettext-tools/tests/xgettext-perl-4
index 1d4701f..09b9322 100755
--- a/gettext-tools/tests/xgettext-perl-4
+++ b/gettext-tools/tests/xgettext-perl-4
@@ -56,8 +56,8 @@ EOPERL
 
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -a --omit-header --no-location -o xg-pl-4.tmp.pot xg-pl-4.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot || exit 1
+${XGETTEXT} -a --omit-header --no-location -o xg-pl-4.tmp.pot xg-pl-4.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot || Exit 1
 
 cat <<\EOF > xg-pl-4.ok
 msgid "'Your command, please?', asked the waiter.\n"
diff --git a/gettext-tools/tests/xgettext-perl-5 b/gettext-tools/tests/xgettext-perl-5
index 5020baf..cc83907 100755
--- a/gettext-tools/tests/xgettext-perl-5
+++ b/gettext-tools/tests/xgettext-perl-5
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-pl-5.tmp xg-pl-5.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po || exit 1
+  -d xg-pl-5.tmp xg-pl-5.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po || Exit 1
 
 cat <<EOF > xg-pl-5.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-perl-6 b/gettext-tools/tests/xgettext-perl-6
index 2347b11..e0abad6 100755
--- a/gettext-tools/tests/xgettext-perl-6
+++ b/gettext-tools/tests/xgettext-perl-6
@@ -65,8 +65,8 @@ EOPERL
 
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} --omit-header --no-location -o xg-pl-6.tmp xg-pl-6.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot || exit 1
+${XGETTEXT} --omit-header --no-location -o xg-pl-6.tmp xg-pl-6.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot || Exit 1
 
 cat <<\EOF > xg-pl-6.ok
 msgid "extracted1"
diff --git a/gettext-tools/tests/xgettext-perl-7 b/gettext-tools/tests/xgettext-perl-7
index b170394..6918587 100755
--- a/gettext-tools/tests/xgettext-perl-7
+++ b/gettext-tools/tests/xgettext-perl-7
@@ -16,8 +16,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-pl-7.tmp xg-pl-7.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po || exit 1
+  -d xg-pl-7.tmp xg-pl-7.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po || Exit 1
 
 cat <<EOF > xg-pl-7.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-perl-8 b/gettext-tools/tests/xgettext-perl-8
index f45aff8..b165e09 100755
--- a/gettext-tools/tests/xgettext-perl-8
+++ b/gettext-tools/tests/xgettext-perl-8
@@ -63,8 +63,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header -n \
   -k__ \
-  -d xg-pl-8.tmp xg-pl-8.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-8.tmp.po > xg-pl-8.po || exit 1
+  -d xg-pl-8.tmp xg-pl-8.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-8.tmp.po > xg-pl-8.po || Exit 1
 
 cat <<\EOF > xg-pl-8.ok
 #: xg-pl-8.pl:1
diff --git a/gettext-tools/tests/xgettext-php-1 b/gettext-tools/tests/xgettext-php-1
index deca6e0..09338ae 100755
--- a/gettext-tools/tests/xgettext-php-1
+++ b/gettext-tools/tests/xgettext-php-1
@@ -24,8 +24,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-ph-1.tmp xg-ph-1.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po || exit 1
+  -d xg-ph-1.tmp xg-ph-1.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po || Exit 1
 
 cat <<EOF > xg-ph-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-php-2 b/gettext-tools/tests/xgettext-php-2
index 34f2e7f..3eb6a92 100755
--- a/gettext-tools/tests/xgettext-php-2
+++ b/gettext-tools/tests/xgettext-php-2
@@ -40,22 +40,22 @@ echo _("Franks");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po || Exit 1
 
-sed 's!<<<EOTMARKER!<<<"EOTMARKER"!' xg-ph-2.php > xg-ph-2d.php || exit 1
-sed "s!<<<EOTMARKER!<<<'EOTMARKER'!" xg-ph-2.php > xg-ph-2s.php || exit 1
+sed 's!<<<EOTMARKER!<<<"EOTMARKER"!' xg-ph-2.php > xg-ph-2d.php || Exit 1
+sed "s!<<<EOTMARKER!<<<'EOTMARKER'!" xg-ph-2.php > xg-ph-2s.php || Exit 1
 
 : ${XGETTEXT=xgettext}
 
-${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po || Exit 1
 
-${XGETTEXT} --omit-header --no-location -d xg-ph-2d.tmp xg-ph-2d.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-2d.tmp.po > xg-ph-2d.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-ph-2d.tmp xg-ph-2d.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-2d.tmp.po > xg-ph-2d.po || Exit 1
 
-${XGETTEXT} --omit-header --no-location -d xg-ph-2s.tmp xg-ph-2s.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-2s.tmp.po > xg-ph-2s.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-ph-2s.tmp xg-ph-2s.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-2s.tmp.po > xg-ph-2s.po || Exit 1
 
 cat <<EOF > xg-ph-2.ok
 msgid "Egyptians"
diff --git a/gettext-tools/tests/xgettext-php-3 b/gettext-tools/tests/xgettext-php-3
index 888a3aa..0561395 100755
--- a/gettext-tools/tests/xgettext-php-3
+++ b/gettext-tools/tests/xgettext-php-3
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-ph-3.tmp xg-ph-3.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po || exit 1
+  -d xg-ph-3.tmp xg-ph-3.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po || Exit 1
 
 cat <<EOF > xg-ph-3.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-php-4 b/gettext-tools/tests/xgettext-php-4
index 8edb553..842ad31 100755
--- a/gettext-tools/tests/xgettext-php-4
+++ b/gettext-tools/tests/xgettext-php-4
@@ -16,8 +16,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --extract-all \
-  -d xg-ph-4.tmp xg-ph-4.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-4.tmp.po > xg-ph-4.po || exit 1
+  -d xg-ph-4.tmp xg-ph-4.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-4.tmp.po > xg-ph-4.po || Exit 1
 
 cat <<EOF > xg-ph-4.ok
 msgid "foobar"
diff --git a/gettext-tools/tests/xgettext-po-1 b/gettext-tools/tests/xgettext-po-1
index 1074e02..1d22136 100755
--- a/gettext-tools/tests/xgettext-po-1
+++ b/gettext-tools/tests/xgettext-po-1
@@ -44,8 +44,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header -n \
-  -d xg-po-1.tmp xg-po-1.in.po xg-po-1.c xg-po-1.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po || exit 1
+  -d xg-po-1.tmp xg-po-1.in.po xg-po-1.c xg-po-1.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po || Exit 1
 
 cat <<EOF > xg-po-1.ok
 #: file1.c:199
diff --git a/gettext-tools/tests/xgettext-properties-1 b/gettext-tools/tests/xgettext-properties-1
index 1e51edd..1261944 100755
--- a/gettext-tools/tests/xgettext-properties-1
+++ b/gettext-tools/tests/xgettext-properties-1
@@ -41,8 +41,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header -n \
-  -d xg-pr-1.tmp xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po || exit 1
+  -d xg-pr-1.tmp xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po || Exit 1
 
 cat <<EOF > xg-pr-1.ok
 #: file1.c:199
diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1
index ab87463..7a4194c 100755
--- a/gettext-tools/tests/xgettext-python-1
+++ b/gettext-tools/tests/xgettext-python-1
@@ -30,7 +30,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-py-1.tmp xg-py-1.py 2>xg-py-1.err
-test $? = 0 || { cat xg-py-1.err; exit 1; }
+test $? = 0 || { cat xg-py-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-py-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-1.pot
diff --git a/gettext-tools/tests/xgettext-python-2 b/gettext-tools/tests/xgettext-python-2
index 5f071d4..2b3d739 100755
--- a/gettext-tools/tests/xgettext-python-2
+++ b/gettext-tools/tests/xgettext-python-2
@@ -21,8 +21,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-py-2.tmp xg-py-2.py || exit 1
-LC_ALL=C tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po || exit 1
+  -d xg-py-2.tmp xg-py-2.py || Exit 1
+LC_ALL=C tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po || Exit 1
 
 cat <<EOF > xg-py-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3
index 3ac44d1..b004b09 100755
--- a/gettext-tools/tests/xgettext-python-3
+++ b/gettext-tools/tests/xgettext-python-3
@@ -45,36 +45,36 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \
   -d xg-py-3a xg-py-3a.py > /dev/null 2>&1
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=euc-jp \
-  -o xg-py-3a.tmp xg-py-3a.py || exit 1
+  -o xg-py-3a.tmp xg-py-3a.py || Exit 1
 # Don't simplify this to "grep ... < xg-py-3a.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-3a.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3a.pot
 
 : ${DIFF=diff}
-${DIFF} xg-py-3.ok xg-py-3a.pot || exit 1
+${DIFF} xg-py-3.ok xg-py-3a.pot || Exit 1
 
 # Verify that if the source file has a magic coding comment, xgettext succeeds.
 
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \
-  -o xg-py-3b.tmp xg-py-3b.py || exit 1
+  -o xg-py-3b.tmp xg-py-3b.py || Exit 1
 # Don't simplify this to "grep ... < xg-py-3b.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-3b.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3b.pot
 
-${DIFF} xg-py-3.ok xg-py-3b.pot || exit 1
+${DIFF} xg-py-3.ok xg-py-3b.pot || Exit 1
 
 # Verify that if the source file has a magic coding comment and a --from-code
 # option is given, the magic coding comment takes precedence over it.
 
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=iso-8859-1 \
-  -o xg-py-3c.tmp xg-py-3b.py || exit 1
+  -o xg-py-3c.tmp xg-py-3b.py || Exit 1
 # Don't simplify this to "grep ... < xg-py-3c.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-3c.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3c.pot
 
-${DIFF} xg-py-3.ok xg-py-3c.pot || exit 1
+${DIFF} xg-py-3.ok xg-py-3c.pot || Exit 1
 
 # Verify that backslashes in and second bytes with value 0x5C are correctly
 # distinguished in weird encodings like BIG5.
@@ -87,7 +87,7 @@ print gettext.gettext(u"¬\\u0021");
 EOF
 
 ${XGETTEXT} --add-comments=TRANSLATORS: \
-  -o xg-py-3d.tmp xg-py-3d.py || exit 1
+  -o xg-py-3d.tmp xg-py-3d.py || Exit 1
 # Don't simplify this to "grep ... < xg-py-3d.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-3d.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3d.pot
@@ -120,6 +120,6 @@ msgid "枯!"
 msgstr ""
 EOF
 
-${DIFF} xg-py-3d.ok xg-py-3d.pot || exit 1
+${DIFF} xg-py-3d.ok xg-py-3d.pot || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/xgettext-python-4 b/gettext-tools/tests/xgettext-python-4
index 49d1c12..e1f5cd5 100755
--- a/gettext-tools/tests/xgettext-python-4
+++ b/gettext-tools/tests/xgettext-python-4
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-py-4.tmp xg-py-4.py || exit 1
-LC_ALL=C tr -d '\r' < xg-py-4.tmp.po > xg-py-4.po || exit 1
+  -d xg-py-4.tmp xg-py-4.py || Exit 1
+LC_ALL=C tr -d '\r' < xg-py-4.tmp.po > xg-py-4.po || Exit 1
 
 cat <<EOF > xg-py-4.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-scheme-1 b/gettext-tools/tests/xgettext-scheme-1
index 4ecccae..576bb51 100755
--- a/gettext-tools/tests/xgettext-scheme-1
+++ b/gettext-tools/tests/xgettext-scheme-1
@@ -15,8 +15,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -k_ --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-sc-1.tmp xg-sc-1.scm || exit 1
-LC_ALL=C tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po || exit 1
+  -d xg-sc-1.tmp xg-sc-1.scm || Exit 1
+LC_ALL=C tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po || Exit 1
 
 cat <<EOF > xg-sc-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-scheme-2 b/gettext-tools/tests/xgettext-scheme-2
index cc7b5bf..8c7fbb8 100755
--- a/gettext-tools/tests/xgettext-scheme-2
+++ b/gettext-tools/tests/xgettext-scheme-2
@@ -8,7 +8,7 @@ cat <<EOF > xg-sc-2.scm
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -k_ --omit-header --no-location --force-po -d xg-sc-2 xg-sc-2.scm || exit 1
+${XGETTEXT} -k_ --omit-header --no-location --force-po -d xg-sc-2 xg-sc-2.scm || Exit 1
 
 cat <<EOF > xg-sc-2.ok
 EOF
diff --git a/gettext-tools/tests/xgettext-scheme-3 b/gettext-tools/tests/xgettext-scheme-3
index 96e821f..fe28ebb 100755
--- a/gettext-tools/tests/xgettext-scheme-3
+++ b/gettext-tools/tests/xgettext-scheme-3
@@ -15,8 +15,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-sc-3.tmp xg-sc-3.scm || exit 1
-LC_ALL=C tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po || exit 1
+  -d xg-sc-3.tmp xg-sc-3.scm || Exit 1
+LC_ALL=C tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po || Exit 1
 
 cat <<EOF > xg-sc-3.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-scheme-4 b/gettext-tools/tests/xgettext-scheme-4
index 3566d6b..1851a46 100755
--- a/gettext-tools/tests/xgettext-scheme-4
+++ b/gettext-tools/tests/xgettext-scheme-4
@@ -19,8 +19,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -k_ --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-sc-4.tmp xg-sc-4.scm || exit 1
-LC_ALL=C tr -d '\r' < xg-sc-4.tmp.po > xg-sc-4.po || exit 1
+  -d xg-sc-4.tmp xg-sc-4.scm || Exit 1
+LC_ALL=C tr -d '\r' < xg-sc-4.tmp.po > xg-sc-4.po || Exit 1
 
 cat <<EOF > xg-sc-4.ok
 msgid "New _Brush..."
diff --git a/gettext-tools/tests/xgettext-sh-1 b/gettext-tools/tests/xgettext-sh-1
index 28e2051..ea24931 100755
--- a/gettext-tools/tests/xgettext-sh-1
+++ b/gettext-tools/tests/xgettext-sh-1
@@ -464,8 +464,8 @@ EOF
 : ${XGETTEXT=xgettext}
 # Here we use ngettext with two signatures: ngettext:1 and ngettext:1,2.
 ${XGETTEXT} --omit-header --no-location --keyword=ngettext:1 \
-  -d xg-sh-1.tmp xg-sh-1.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po || exit 1
+  -d xg-sh-1.tmp xg-sh-1.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po || Exit 1
 
 cat <<\EOF > xg-sh-1.ok
 msgid "depth_0_none_0_x"
diff --git a/gettext-tools/tests/xgettext-sh-2 b/gettext-tools/tests/xgettext-sh-2
index daf1c02..a4b7e8d 100755
--- a/gettext-tools/tests/xgettext-sh-2
+++ b/gettext-tools/tests/xgettext-sh-2
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-sh-2.tmp xg-sh-2.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po || exit 1
+  -d xg-sh-2.tmp xg-sh-2.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po || Exit 1
 
 cat <<EOF > xg-sh-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-sh-3 b/gettext-tools/tests/xgettext-sh-3
index e6cadfe..7f70b95 100755
--- a/gettext-tools/tests/xgettext-sh-3
+++ b/gettext-tools/tests/xgettext-sh-3
@@ -10,8 +10,8 @@ echo `gettext $'\'\"\a\b\e\f\n\r\t\v\x61\x3a\x3A\075\\'`
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-sh-3.tmp xg-sh-3.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-sh-3.tmp xg-sh-3.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po || Exit 1
 
 cat <<\EOF > xg-sh-3.ok
 msgid "abc\\\"def"
diff --git a/gettext-tools/tests/xgettext-sh-4 b/gettext-tools/tests/xgettext-sh-4
index 7096d8c..dfd8399 100755
--- a/gettext-tools/tests/xgettext-sh-4
+++ b/gettext-tools/tests/xgettext-sh-4
@@ -115,8 +115,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location -d xg-sh-4.tmp xg-sh-4.sh 2>xg-sh-4.err
-test $? = 0 || { cat xg-sh-4.err; exit 1; }
-LC_ALL=C tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po || exit 1
+test $? = 0 || { cat xg-sh-4.err; Exit 1; }
+LC_ALL=C tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po || Exit 1
 
 cat <<\EOF > xg-sh-4.ok
 msgid "depth_0_bashquote_0_x"
diff --git a/gettext-tools/tests/xgettext-sh-5 b/gettext-tools/tests/xgettext-sh-5
index 9daf65f..a5937b0 100755
--- a/gettext-tools/tests/xgettext-sh-5
+++ b/gettext-tools/tests/xgettext-sh-5
@@ -15,8 +15,8 @@ echo "$(gettext "Simple decorated dstring: \"x\" \\\"y\\\" inside double-quotes"
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-sh-5.tmp xg-sh-5.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-sh-5.tmp xg-sh-5.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po || Exit 1
 
 cat <<\EOF > xg-sh-5.ok
 msgid "Simple string"
diff --git a/gettext-tools/tests/xgettext-sh-6 b/gettext-tools/tests/xgettext-sh-6
index 0bc2eec..656781d 100755
--- a/gettext-tools/tests/xgettext-sh-6
+++ b/gettext-tools/tests/xgettext-sh-6
@@ -10,8 +10,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-sh-6.tmp xg-sh-6.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po || exit 1
+  -d xg-sh-6.tmp xg-sh-6.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po || Exit 1
 
 cat <<EOF > xg-sh-6.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-smalltalk-1 b/gettext-tools/tests/xgettext-smalltalk-1
index 7c50834..b949380 100755
--- a/gettext-tools/tests/xgettext-smalltalk-1
+++ b/gettext-tools/tests/xgettext-smalltalk-1
@@ -18,8 +18,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-st-1.tmp xg-st-1.st || exit 1
-LC_ALL=C tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po || exit 1
+  -d xg-st-1.tmp xg-st-1.st || Exit 1
+LC_ALL=C tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po || Exit 1
 
 cat <<EOF > xg-st-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-smalltalk-2 b/gettext-tools/tests/xgettext-smalltalk-2
index 9814efa..01d61fa 100755
--- a/gettext-tools/tests/xgettext-smalltalk-2
+++ b/gettext-tools/tests/xgettext-smalltalk-2
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location \
-  -d xg-st-2.tmp xg-st-2.st || exit 1
-LC_ALL=C tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po || exit 1
+  -d xg-st-2.tmp xg-st-2.st || Exit 1
+LC_ALL=C tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po || Exit 1
 
 cat <<EOF > xg-st-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-stringtable-1 b/gettext-tools/tests/xgettext-stringtable-1
index 4fd08fa..4bbe17a 100755
--- a/gettext-tools/tests/xgettext-stringtable-1
+++ b/gettext-tools/tests/xgettext-stringtable-1
@@ -21,7 +21,7 @@ add comments above this one
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-stbl-1.tmp xg-stbl-1.strings || exit 1
+${XGETTEXT} -o xg-stbl-1.tmp xg-stbl-1.strings || Exit 1
 # Don't simplify this to "grep ... < xg-stbl-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-stbl-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-stbl-1.po
diff --git a/gettext-tools/tests/xgettext-tcl-1 b/gettext-tools/tests/xgettext-tcl-1
index 645e19a..2126318 100755
--- a/gettext-tools/tests/xgettext-tcl-1
+++ b/gettext-tools/tests/xgettext-tcl-1
@@ -23,7 +23,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -k_ -o xg-t-1.tmp xg-t-1.tcl 2>xg-t-1.err
-test $? = 0 || { cat xg-t-1.err; exit 1; }
+test $? = 0 || { cat xg-t-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-t-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-t-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-t-1.pot
diff --git a/gettext-tools/tests/xgettext-tcl-2 b/gettext-tools/tests/xgettext-tcl-2
index c087686..bbacdf8 100755
--- a/gettext-tools/tests/xgettext-tcl-2
+++ b/gettext-tools/tests/xgettext-tcl-2
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: -k_ \
-  -d xg-t-2.tmp xg-t-2.tcl || exit 1
-LC_ALL=C tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po || exit 1
+  -d xg-t-2.tmp xg-t-2.tcl || Exit 1
+LC_ALL=C tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po || Exit 1
 
 cat <<EOF > xg-t-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-tcl-3 b/gettext-tools/tests/xgettext-tcl-3
index 2593e6a..fd60c74 100755
--- a/gettext-tools/tests/xgettext-tcl-3
+++ b/gettext-tools/tests/xgettext-tcl-3
@@ -11,8 +11,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-t-3.tmp xg-t-3.tcl || exit 1
-LC_ALL=C tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po || exit 1
+  -d xg-t-3.tmp xg-t-3.tcl || Exit 1
+LC_ALL=C tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po || Exit 1
 
 cat <<EOF > xg-t-3.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-tcl-4 b/gettext-tools/tests/xgettext-tcl-4
index 336f477..ab6af3d 100755
--- a/gettext-tools/tests/xgettext-tcl-4
+++ b/gettext-tools/tests/xgettext-tcl-4
@@ -11,7 +11,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -k_ -o xg-t-4.tmp xg-t-4.tcl 2>xg-t-4.err
-test $? = 0 || { cat xg-t-4.err; exit 1; }
+test $? = 0 || { cat xg-t-4.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-t-4.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-t-4.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-t-4.pot
diff --git a/gettext-tools/tests/xgettext-vala-1 b/gettext-tools/tests/xgettext-vala-1
index 141a2de..8d3e8e3 100755
--- a/gettext-tools/tests/xgettext-vala-1
+++ b/gettext-tools/tests/xgettext-vala-1
@@ -10,7 +10,7 @@ int main (string[] args) {
   var r1 = /a
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location -o - xg-vala-1.err.vala 2>&1; exit) | grep 'regular expression literal terminated too early' || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location -o - xg-vala-1.err.vala 2>&1; exit) | grep 'regular expression literal terminated too early' || Exit 1
 
 cat <<\EOF > xg-vala-1.vala
 int main (string[] args) {
@@ -92,7 +92,7 @@ class Foo : Object {
 EOF
 
 ${XGETTEXT} --add-comments --no-location -o xg-vala-1.tmp xg-vala-1.vala 2>xg-vala-1.err
-test $? = 0 || { cat xg-vala-1.err; exit 1; }
+test $? = 0 || { cat xg-vala-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-vala-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-vala-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-vala-1.pot
@@ -148,7 +148,7 @@ test $result = 0 || exit $result
 
 # Test --extract-all option.
 ${XGETTEXT} --extract-all --add-comments --no-location -o xg-vala-1.tmp xg-vala-1.vala 2>xg-vala-1.err
-test $? = 0 || { cat xg-vala-1.err; exit 1; }
+test $? = 0 || { cat xg-vala-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-vala-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-vala-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-vala-1.pot
diff --git a/gettext-tools/tests/xgettext-ycp-1 b/gettext-tools/tests/xgettext-ycp-1
index b6d4348..72eef7c 100755
--- a/gettext-tools/tests/xgettext-ycp-1
+++ b/gettext-tools/tests/xgettext-ycp-1
@@ -9,8 +9,8 @@ title = sformat (_("%1 package", "%1 packages", num), num);
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1.tmp xg-y-1.ycp || exit 1
-LC_ALL=C tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po || exit 1
+${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1.tmp xg-y-1.ycp || Exit 1
+LC_ALL=C tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po || Exit 1
 
 cat <<EOF > xg-y-1.ok
 #, ycp-format
diff --git a/gettext-tools/tests/xgettext-ycp-2 b/gettext-tools/tests/xgettext-ycp-2
index b5ea282..b8bb5a7 100755
--- a/gettext-tools/tests/xgettext-ycp-2
+++ b/gettext-tools/tests/xgettext-ycp-2
@@ -20,8 +20,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-y-2.tmp xg-y-2.ycp || exit 1
-LC_ALL=C tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po || exit 1
+  -d xg-y-2.tmp xg-y-2.ycp || Exit 1
+LC_ALL=C tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po || Exit 1
 
 cat <<EOF > xg-y-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-ycp-3 b/gettext-tools/tests/xgettext-ycp-3
index 6325db6..bb0f014 100755
--- a/gettext-tools/tests/xgettext-ycp-3
+++ b/gettext-tools/tests/xgettext-ycp-3
@@ -11,8 +11,8 @@ print (_("John\n"
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-y-3.tmp xg-y-3.ycp || exit 1
-LC_ALL=C tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-y-3.tmp xg-y-3.ycp || Exit 1
+LC_ALL=C tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po || Exit 1
 
 cat <<\EOF > xg-y-3.ok
 msgid ""
diff --git a/gettext-tools/tests/xgettext-ycp-4 b/gettext-tools/tests/xgettext-ycp-4
index 6a958ee..d9fb173 100755
--- a/gettext-tools/tests/xgettext-ycp-4
+++ b/gettext-tools/tests/xgettext-ycp-4
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-y-4.tmp xg-y-4.ycp || exit 1
-LC_ALL=C tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po || exit 1
+  -d xg-y-4.tmp xg-y-4.ycp || Exit 1
+LC_ALL=C tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po || Exit 1
 
 cat <<EOF > xg-y-4.ok
 #. a
diff --git a/gettext-tools/woe32dll/export.h b/gettext-tools/woe32dll/export.h
index 35dcce9..fa89005 100644
--- a/gettext-tools/woe32dll/export.h
+++ b/gettext-tools/woe32dll/export.h
@@ -1,5 +1,5 @@
 /* Exporting symbols from Cygwin shared libraries.
-   Copyright (C) 2006, 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/woe32dll/gettextlib-exports.c b/gettext-tools/woe32dll/gettextlib-exports.c
index 0fa6a6b..7677ebf 100644
--- a/gettext-tools/woe32dll/gettextlib-exports.c
+++ b/gettext-tools/woe32dll/gettextlib-exports.c
@@ -1,5 +1,5 @@
 /* List of exported symbols of libgettextlib on Cygwin.
-   Copyright (C) 2006-2007, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/woe32dll/gettextpo-exports.c b/gettext-tools/woe32dll/gettextpo-exports.c
index a4b7c70..951b25e 100644
--- a/gettext-tools/woe32dll/gettextpo-exports.c
+++ b/gettext-tools/woe32dll/gettextpo-exports.c
@@ -1,5 +1,5 @@
 /* List of exported symbols of libgettextpo on Cygwin.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c
index 86b34cd..a7646a0 100644
--- a/gettext-tools/woe32dll/gettextsrc-exports.c
+++ b/gettext-tools/woe32dll/gettextsrc-exports.c
@@ -1,5 +1,5 @@
 /* List of exported symbols of libgettextsrc on Cygwin.
-   Copyright (C) 2006-2007, 2009, 2011, 2015 Free Software Foundation,
+   Copyright (C) 2006-2007, 2009, 2011, 2015-2016 Free Software Foundation,
    Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 34ebea9..37c801c 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gnulib-local directory of GNU gettext
-## Copyright (C) 2006-2008, 2010-2011, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 2006-2008, 2010-2011, 2015-2016 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
@@ -224,6 +223,7 @@ lib/obstack.h.diff \
 lib/ostream.oo.c \
 lib/ostream.oo.h \
 lib/progname.h.diff \
+lib/regcomp.c.diff \
 lib/regexec.c.diff \
 lib/regex_internal.h.diff \
 lib/spawn-pipe.c.diff \
@@ -249,7 +249,6 @@ m4/alloca.m4 \
 m4/backupfile.m4 \
 m4/curses.m4 \
 m4/gcj.m4 \
-m4/hard-locale.m4.diff \
 m4/libcroco.m4 \
 m4/libglib.m4 \
 m4/libxml.m4 \
diff --git a/gnulib-local/Makefile.in b/gnulib-local/Makefile.in
index 3e2c135..d4c371d 100644
--- a/gnulib-local/Makefile.in
+++ b/gnulib-local/Makefile.in
@@ -426,6 +426,7 @@ lib/obstack.h.diff \
 lib/ostream.oo.c \
 lib/ostream.oo.h \
 lib/progname.h.diff \
+lib/regcomp.c.diff \
 lib/regexec.c.diff \
 lib/regex_internal.h.diff \
 lib/spawn-pipe.c.diff \
@@ -451,7 +452,6 @@ m4/alloca.m4 \
 m4/backupfile.m4 \
 m4/curses.m4 \
 m4/gcj.m4 \
-m4/hard-locale.m4.diff \
 m4/libcroco.m4 \
 m4/libglib.m4 \
 m4/libxml.m4 \
diff --git a/gnulib-local/build-aux/moopp b/gnulib-local/build-aux/moopp
index 96a50a6..c155d93 100755
--- a/gnulib-local/build-aux/moopp
+++ b/gnulib-local/build-aux/moopp
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Minimal Object-Oriented style PreProcessor.
 
-# Copyright (C) 2006-2008, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2008, 2015-2016 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2006.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -306,12 +306,12 @@ func_check_header_syntax ()
   }
   class_end_lineno=`expr $methods_lineno + $class_end_lineno`
   sed_extract_methods="$class_end_lineno"',$d;1,'"$methods_lineno"'d'
-  methods=`sed -e "$sed_remove_comments" < "$file" | sed -e "$sed_extract_methods" | tr '\n' ' ' | tr ';' '\n' | sed -e 's,[ 	]*$,,'`
+  methods=`sed -e "$sed_remove_comments" < "$file" | sed -e "$sed_extract_methods" | tr '\015\n' '  ' | tr ';' '\n' | sed -e 's,[ 	]*$,,'`
   sed_remove_valid_arg1_lines='/([ 	]*'"$classname"'_t[ 	]*[A-Za-z_0-9]*[ 	]*[,)]/d'
   sed_extract_method_name='s,^.*[^A-Za-z_0-9]\([A-Za-z_0-9][A-Za-z_0-9]*\)[ 	]*(.*$,\1,'
   methods_with_bad_arg1=`echo "$methods" | sed -e "$sed_remove_empty_lines" -e "$sed_remove_valid_arg1_lines" -e "$sed_extract_method_name"`
   if test -n "$methods_with_bad_arg1"; then
-    methods_with_bad_arg1=`{ echo "$methods_with_bad_arg1" | sed -e 's/$/, /' | tr -d '\n'; echo; } | sed -e 's/\(, \)*$//'`
+    methods_with_bad_arg1=`{ echo "$methods_with_bad_arg1" | sed -e 's/$/, /' | tr -d '\015\n'; echo; } | sed -e 's/\(, \)*$//'`
     func_fatal_error "$file: some methods don't have a first argument of type ${classname}_t: $methods_with_bad_arg1"
   fi
 }
diff --git a/gnulib-local/lib/addext.c b/gnulib-local/lib/addext.c
index bea586f..9cc64c0 100644
--- a/gnulib-local/lib/addext.c
+++ b/gnulib-local/lib/addext.c
@@ -1,6 +1,6 @@
 /* addext.c -- add an extension to a file name
-   Copyright (C) 1990, 1997-1999, 2001-2003, 2005-2006, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990, 1997-1999, 2001-2003, 2005-2006, 2015-2016 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
diff --git a/gnulib-local/lib/alloca.in.h b/gnulib-local/lib/alloca.in.h
index b334262..8603e79 100644
--- a/gnulib-local/lib/alloca.in.h
+++ b/gnulib-local/lib/alloca.in.h
@@ -1,5 +1,5 @@
 /* Memory allocation on the stack.
-   Copyright (C) 1995, 1999, 2001-2007, 2015 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2007, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/backupfile.c b/gnulib-local/lib/backupfile.c
index 5ec0228..7d9313f 100644
--- a/gnulib-local/lib/backupfile.c
+++ b/gnulib-local/lib/backupfile.c
@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990-2003, 2005-2006, 2012, 2015 Free Software
+   Copyright (C) 1990-2003, 2005-2006, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/backupfile.h b/gnulib-local/lib/backupfile.h
index 91c37fa..279c2fb 100644
--- a/gnulib-local/lib/backupfile.h
+++ b/gnulib-local/lib/backupfile.h
@@ -1,5 +1,5 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
-   Copyright (C) 1990-1992, 1997-1999, 2001-2003, 2015 Free Software
+   Copyright (C) 1990-1992, 1997-1999, 2001-2003, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/basename.c b/gnulib-local/lib/basename.c
index 56421aa..3518ade 100644
--- a/gnulib-local/lib/basename.c
+++ b/gnulib-local/lib/basename.c
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015 Free Software
+   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gnulib-local/lib/basename.h b/gnulib-local/lib/basename.h
index 489cc67..2d7f0ad 100644
--- a/gnulib-local/lib/basename.h
+++ b/gnulib-local/lib/basename.h
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001-2003, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/closeout.c b/gnulib-local/lib/closeout.c
index a790176..8bba65b 100644
--- a/gnulib-local/lib/closeout.c
+++ b/gnulib-local/lib/closeout.c
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output and standard error
-   Copyright (C) 1998-2007, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2007, 2012, 2015-2016 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
diff --git a/gnulib-local/lib/closeout.h b/gnulib-local/lib/closeout.h
index 896e22f..284d1e7 100644
--- a/gnulib-local/lib/closeout.h
+++ b/gnulib-local/lib/closeout.h
@@ -1,5 +1,5 @@
 /* Close standard output and standard error.
-   Copyright (C) 1998-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2003, 2006, 2015-2016 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
diff --git a/gnulib-local/lib/error-progname.c b/gnulib-local/lib/error-progname.c
index 525d11f..ba2702a 100644
--- a/gnulib-local/lib/error-progname.c
+++ b/gnulib-local/lib/error-progname.c
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/error-progname.h b/gnulib-local/lib/error-progname.h
index f16107a..5b89b71 100644
--- a/gnulib-local/lib/error-progname.h
+++ b/gnulib-local/lib/error-progname.h
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/fd-ostream.oo.c b/gnulib-local/lib/fd-ostream.oo.c
index 64b9597..b4e1e50 100644
--- a/gnulib-local/lib/fd-ostream.oo.c
+++ b/gnulib-local/lib/fd-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream referring to a file descriptor.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/fd-ostream.oo.h b/gnulib-local/lib/fd-ostream.oo.h
index 155b627..6415401 100644
--- a/gnulib-local/lib/fd-ostream.oo.h
+++ b/gnulib-local/lib/fd-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream referring to a file descriptor.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/file-ostream.oo.c b/gnulib-local/lib/file-ostream.oo.c
index a500825..0b19942 100644
--- a/gnulib-local/lib/file-ostream.oo.c
+++ b/gnulib-local/lib/file-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/file-ostream.oo.h b/gnulib-local/lib/file-ostream.oo.h
index 395cef7..8b4fd8b 100644
--- a/gnulib-local/lib/file-ostream.oo.h
+++ b/gnulib-local/lib/file-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/gettext.h b/gnulib-local/lib/gettext.h
index 7d96228..3d4233c 100644
--- a/gnulib-local/lib/gettext.h
+++ b/gnulib-local/lib/gettext.h
@@ -1,6 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -225,15 +225,17 @@ dcpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcgettext (domain, msg_ctxt_id, category);
+      found_translation = (translation != msg_ctxt_id);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (translation != msg_ctxt_id)
+      if (found_translation)
         return translation;
     }
   return msgid;
@@ -271,15 +273,17 @@ dcnpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+      found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (!(translation == msg_ctxt_id || translation == msgid_plural))
+      if (found_translation)
         return translation;
     }
   return (n == 1 ? msgid : msgid_plural);
diff --git a/gnulib-local/lib/glib/gstrfuncs.c b/gnulib-local/lib/glib/gstrfuncs.c
index 8796226..ce692fd 100644
--- a/gnulib-local/lib/glib/gstrfuncs.c
+++ b/gnulib-local/lib/glib/gstrfuncs.c
@@ -621,7 +621,7 @@ g_parse_long_long (const gchar *nptr,
   /* this code is based on on the strtol(3) code from GNU libc released under
    * the GNU Lesser General Public License.
    *
-   * Copyright (C) 1991-1992, 1994-2000, 1901-1902, 2015 Free Software
+   * Copyright (C) 1991-1992, 1994-2000, 1901-1902, 2015-2016 Free Software
    * Foundation, Inc.
    */
 #define ISSPACE(c)		((c) == ' ' || (c) == '\f' || (c) == '\n' || \
diff --git a/gnulib-local/lib/hash.c b/gnulib-local/lib/hash.c
index 89fa5ec..4202f79 100644
--- a/gnulib-local/lib/hash.c
+++ b/gnulib-local/lib/hash.c
@@ -1,6 +1,5 @@
 /* hash - implement simple hashing table with string based keys.
-   Copyright (C) 1994-1995, 2000-2006, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1994-1995, 2000-2006, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, October 1994.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/hash.h b/gnulib-local/lib/hash.h
index 0cf972f..f826baf 100644
--- a/gnulib-local/lib/hash.h
+++ b/gnulib-local/lib/hash.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015 Free Software
+/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015-2016 Free Software
  * Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/html-ostream.oo.c b/gnulib-local/lib/html-ostream.oo.c
index afa84d3..be4fd40 100644
--- a/gnulib-local/lib/html-ostream.oo.c
+++ b/gnulib-local/lib/html-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream that produces HTML output.
-   Copyright (C) 2006-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/html-ostream.oo.h b/gnulib-local/lib/html-ostream.oo.h
index 87c6f3d..d044a78 100644
--- a/gnulib-local/lib/html-ostream.oo.h
+++ b/gnulib-local/lib/html-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream that produces HTML output.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/html-styled-ostream.oo.c b/gnulib-local/lib/html-styled-ostream.oo.c
index ef187dd..7722347 100644
--- a/gnulib-local/lib/html-styled-ostream.oo.c
+++ b/gnulib-local/lib/html-styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing HTML output.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/html-styled-ostream.oo.h b/gnulib-local/lib/html-styled-ostream.oo.h
index d66bb2e..02e7c72 100644
--- a/gnulib-local/lib/html-styled-ostream.oo.h
+++ b/gnulib-local/lib/html-styled-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing HTML output.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/iconv-ostream.oo.c b/gnulib-local/lib/iconv-ostream.oo.c
index a7314fa..8048aec 100644
--- a/gnulib-local/lib/iconv-ostream.oo.c
+++ b/gnulib-local/lib/iconv-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream that converts the output to another encoding.
-   Copyright (C) 2006-2007, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/iconv-ostream.oo.h b/gnulib-local/lib/iconv-ostream.oo.h
index 961ad06..d09ec32 100644
--- a/gnulib-local/lib/iconv-ostream.oo.h
+++ b/gnulib-local/lib/iconv-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream that converts the output to another encoding.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/memory-ostream.oo.c b/gnulib-local/lib/memory-ostream.oo.c
index 2468ed5..db08085 100644
--- a/gnulib-local/lib/memory-ostream.oo.c
+++ b/gnulib-local/lib/memory-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream that accumulates the output in memory.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/memory-ostream.oo.h b/gnulib-local/lib/memory-ostream.oo.h
index ae9ef15..125fbb1 100644
--- a/gnulib-local/lib/memory-ostream.oo.h
+++ b/gnulib-local/lib/memory-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream that accumulates the output in memory.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/moo.h b/gnulib-local/lib/moo.h
index f11a2b8..68838b0 100644
--- a/gnulib-local/lib/moo.h
+++ b/gnulib-local/lib/moo.h
@@ -1,5 +1,5 @@
 /* Minimal object-oriented facilities for C.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/ostream.oo.c b/gnulib-local/lib/ostream.oo.c
index 3c178fa..443b03c 100644
--- a/gnulib-local/lib/ostream.oo.c
+++ b/gnulib-local/lib/ostream.oo.c
@@ -1,5 +1,5 @@
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/ostream.oo.h b/gnulib-local/lib/ostream.oo.h
index 87199df..d0882b9 100644
--- a/gnulib-local/lib/ostream.oo.h
+++ b/gnulib-local/lib/ostream.oo.h
@@ -1,5 +1,5 @@
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/regcomp.c.diff b/gnulib-local/lib/regcomp.c.diff
new file mode 100644
index 0000000..a6ef920
--- /dev/null
+++ b/gnulib-local/lib/regcomp.c.diff
@@ -0,0 +1,22 @@
+diff --git a/regcomp.c b/regcomp.c
+index 6de9b72..1f24938 100644
+--- a/regcomp.c
++++ b/regcomp.c
+@@ -464,7 +464,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
+    the return codes and their meanings.)  */
+ 
+ int
+-regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags)
++regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
+ {
+   reg_errcode_t ret;
+   reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
+@@ -523,7 +523,7 @@ weak_alias (__regcomp, regcomp)
+    from either regcomp or regexec.   We don't use PREG here.  */
+ 
+ size_t
+-regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf,
++regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf,
+ 	  size_t errbuf_size)
+ {
+   const char *msg;
diff --git a/gnulib-local/lib/styled-ostream.oo.c b/gnulib-local/lib/styled-ostream.oo.c
index 03ecbc0..f8522c7 100644
--- a/gnulib-local/lib/styled-ostream.oo.c
+++ b/gnulib-local/lib/styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Abstract output stream for CSS styled text.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/styled-ostream.oo.h b/gnulib-local/lib/styled-ostream.oo.h
index 4e9c8d0..b3c8980 100644
--- a/gnulib-local/lib/styled-ostream.oo.h
+++ b/gnulib-local/lib/styled-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Abstract output stream for CSS styled text.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/term-ostream.oo.c b/gnulib-local/lib/term-ostream.oo.c
index 243619a..165fc33 100644
--- a/gnulib-local/lib/term-ostream.oo.c
+++ b/gnulib-local/lib/term-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for attributed text, producing ANSI escape sequences.
-   Copyright (C) 2006-2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/term-ostream.oo.h b/gnulib-local/lib/term-ostream.oo.h
index 8883b8f..e3e1498 100644
--- a/gnulib-local/lib/term-ostream.oo.h
+++ b/gnulib-local/lib/term-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream for attributed text, producing ANSI escape sequences.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/term-styled-ostream.oo.c b/gnulib-local/lib/term-styled-ostream.oo.c
index 658574b..81a4074 100644
--- a/gnulib-local/lib/term-styled-ostream.oo.c
+++ b/gnulib-local/lib/term-styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing ANSI escape sequences.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/term-styled-ostream.oo.h b/gnulib-local/lib/term-styled-ostream.oo.h
index 05335ce..f9f84fd 100644
--- a/gnulib-local/lib/term-styled-ostream.oo.h
+++ b/gnulib-local/lib/term-styled-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing ANSI escape sequences.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/termcap.h b/gnulib-local/lib/termcap.h
index 944c63d..14abfd6 100644
--- a/gnulib-local/lib/termcap.h
+++ b/gnulib-local/lib/termcap.h
@@ -1,5 +1,5 @@
 /* Information about terminal capabilities.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/terminfo.h b/gnulib-local/lib/terminfo.h
index 6e412f0..da973fd 100644
--- a/gnulib-local/lib/terminfo.h
+++ b/gnulib-local/lib/terminfo.h
@@ -1,5 +1,5 @@
 /* Information about terminal capabilities.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/tparm.c b/gnulib-local/lib/tparm.c
index 817a691..66f09ea 100644
--- a/gnulib-local/lib/tparm.c
+++ b/gnulib-local/lib/tparm.c
@@ -1,5 +1,5 @@
 /* Substitution of parameters in strings from terminal descriptions.
-   Copyright (C) 2006, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2012, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gnulib-local/lib/tputs.c b/gnulib-local/lib/tputs.c
index 03c07f3..0653f3a 100644
--- a/gnulib-local/lib/tputs.c
+++ b/gnulib-local/lib/tputs.c
@@ -1,5 +1,5 @@
 /* Output of string from terminal descriptions.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gnulib-local/lib/xalloc.h b/gnulib-local/lib/xalloc.h
index b261994..f4a329e 100644
--- a/gnulib-local/lib/xalloc.h
+++ b/gnulib-local/lib/xalloc.h
@@ -1,5 +1,5 @@
 /* malloc with out of memory checking.
-   Copyright (C) 2001-2004, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/xerror.c b/gnulib-local/lib/xerror.c
index 705b553..3c1e799 100644
--- a/gnulib-local/lib/xerror.c
+++ b/gnulib-local/lib/xerror.c
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/xerror.h b/gnulib-local/lib/xerror.h
index fc8b163..d702c3a 100644
--- a/gnulib-local/lib/xerror.h
+++ b/gnulib-local/lib/xerror.h
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/xgetcwd.c b/gnulib-local/lib/xgetcwd.c
index d939c63..53c21ab 100644
--- a/gnulib-local/lib/xgetcwd.c
+++ b/gnulib-local/lib/xgetcwd.c
@@ -1,5 +1,5 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992, 1996, 2000, 2003, 2005-2006, 2011, 2015 Free
+   Copyright (C) 1992, 1996, 2000, 2003, 2005-2006, 2011, 2015-2016 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/xgetcwd.h b/gnulib-local/lib/xgetcwd.h
index 8c7e988..c3617ac 100644
--- a/gnulib-local/lib/xgetcwd.h
+++ b/gnulib-local/lib/xgetcwd.h
@@ -1,5 +1,5 @@
 /* xgetcwd -- return current directory with unlimited length
-   Copyright (C) 1995, 2001-2002, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2002, 2015-2016 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
diff --git a/gnulib-local/lib/xmalloc.c b/gnulib-local/lib/xmalloc.c
index 43dcb94..9d435a5 100644
--- a/gnulib-local/lib/xmalloc.c
+++ b/gnulib-local/lib/xmalloc.c
@@ -1,6 +1,6 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015-2016 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
diff --git a/gnulib-local/lib/xstrdup.c b/gnulib-local/lib/xstrdup.c
index 7aa09dc..c7fbe14 100644
--- a/gnulib-local/lib/xstrdup.c
+++ b/gnulib-local/lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015 Free Software
+   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/m4/alloca.m4 b/gnulib-local/m4/alloca.m4
index c7165e5..64f9a79 100644
--- a/gnulib-local/m4/alloca.m4
+++ b/gnulib-local/m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011, 2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006, 2011, 2015-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gnulib-local/m4/backupfile.m4 b/gnulib-local/m4/backupfile.m4
index febc532..5e88347 100644
--- a/gnulib-local/m4/backupfile.m4
+++ b/gnulib-local/m4/backupfile.m4
@@ -1,5 +1,5 @@
 # backupfile.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/curses.m4 b/gnulib-local/m4/curses.m4
index 9de43d2..38edc30 100644
--- a/gnulib-local/m4/curses.m4
+++ b/gnulib-local/m4/curses.m4
@@ -1,5 +1,5 @@
 # curses.m4 serial 1 (gettext-0.18)
-dnl Copyright (C) 2008, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/gcj.m4 b/gnulib-local/m4/gcj.m4
index 021bc7c..521ee7d 100644
--- a/gnulib-local/m4/gcj.m4
+++ b/gnulib-local/m4/gcj.m4
@@ -1,5 +1,5 @@
 # gcj.m4 serial 2 (gettext-0.17)
-dnl Copyright (C) 2002, 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/hard-locale.m4.diff b/gnulib-local/m4/hard-locale.m4.diff
deleted file mode 100644
index 1071d48..0000000
--- a/gnulib-local/m4/hard-locale.m4.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-*** gnulib/m4/hard-locale.m4	2005-03-21 23:06:27.000000000 +0100
---- gettext-tools/m4/hard-locale.m4	2005-03-09 00:49:02.000000000 +0100
-***************
-*** 5,11 ****
-  dnl with or without modifications, as long as this notice is preserved.
-  
-  dnl No prerequisites of lib/hard-locale.c.
-! AC_DEFUN([gl_HARD_LOCALE],
-! [
-!   AC_LIBOBJ([hard-locale])
-! ])
---- 5,8 ----
-  dnl with or without modifications, as long as this notice is preserved.
-  
-  dnl No prerequisites of lib/hard-locale.c.
-! AC_DEFUN([gl_HARD_LOCALE], [:])
diff --git a/gnulib-local/m4/java.m4 b/gnulib-local/m4/java.m4
index 3285dd5..9888af1 100644
--- a/gnulib-local/m4/java.m4
+++ b/gnulib-local/m4/java.m4
@@ -1,5 +1,5 @@
 # java.m4 serial 1 (gettext-0.15)
-dnl Copyright (C) 2005, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/libcroco.m4 b/gnulib-local/m4/libcroco.m4
index 859080c..f79ea82 100644
--- a/gnulib-local/m4/libcroco.m4
+++ b/gnulib-local/m4/libcroco.m4
@@ -1,5 +1,5 @@
 # libcroco.m4 serial 2 (gettext-0.17)
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/libglib.m4 b/gnulib-local/m4/libglib.m4
index f0df4ce..42e55e6 100644
--- a/gnulib-local/m4/libglib.m4
+++ b/gnulib-local/m4/libglib.m4
@@ -1,5 +1,5 @@
 # libglib.m4 serial 3 (gettext-0.17)
-dnl Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/libxml.m4 b/gnulib-local/m4/libxml.m4
index fa8e8e7..480c700 100644
--- a/gnulib-local/m4/libxml.m4
+++ b/gnulib-local/m4/libxml.m4
@@ -1,5 +1,5 @@
 # libxml.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2006, 2008, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -44,8 +44,12 @@ AC_DEFUN([gl_LIBXML],
       LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
       AC_TRY_LINK([#include <libxml/xmlversion.h>
                    #include <libxml/xmlmemory.h>
+                   #include <libxml/xpath.h>
                   ],
-        [xmlCheckVersion (0); xmlFree ((void *) 0);],
+        [xmlCheckVersion (0);
+         xmlFree ((void *) 0);
+         xmlXPathSetContextNode ((void *)0, (void *)0);
+        ],
         [gl_cv_libxml=yes
          gl_cv_LIBXML="$LIBXML2 $LIBICONV"
          gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -55,8 +59,12 @@ AC_DEFUN([gl_LIBXML],
         CPPFLAGS="$CPPFLAGS $INCXML2"
         AC_TRY_LINK([#include <libxml/xmlversion.h>
                      #include <libxml/xmlmemory.h>
+                     #include <libxml/xpath.h>
                     ],
-          [xmlCheckVersion (0); xmlFree ((void *) 0);],
+          [xmlCheckVersion (0);
+           xmlFree ((void *) 0);
+           xmlXPathSetContextNode ((void *)0, (void *)0);
+          ],
           [gl_cv_libxml=yes
            gl_cv_LIBXML="$LIBXML2 $LIBICONV"
            gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -82,8 +90,12 @@ AC_DEFUN([gl_LIBXML],
             CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
             AC_TRY_LINK([#include <libxml/xmlversion.h>
                          #include <libxml/xmlmemory.h>
+                         #include <libxml/xpath.h>
                         ],
-              [xmlCheckVersion (0); xmlFree ((void *) 0);],
+              [xmlCheckVersion (0);
+               xmlFree ((void *) 0);
+               xmlXPathSetContextNode ((void *)0, (void *)0);
+              ],
               [gl_cv_libxml=yes
                gl_cv_LIBXML="$LIBXML2 $LIBICONV"
                gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
diff --git a/gnulib-local/m4/moo.m4 b/gnulib-local/m4/moo.m4
index 3bda672..88e66a9 100644
--- a/gnulib-local/m4/moo.m4
+++ b/gnulib-local/m4/moo.m4
@@ -1,5 +1,5 @@
 # moo.m4 serial 1 (gettext-0.17)
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/term-ostream.m4 b/gnulib-local/m4/term-ostream.m4
index c227384..bcc931e 100644
--- a/gnulib-local/m4/term-ostream.m4
+++ b/gnulib-local/m4/term-ostream.m4
@@ -1,5 +1,5 @@
 # term-ostream.m4 serial 1
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/gnulib-local/m4/termcap.m4 b/gnulib-local/m4/termcap.m4
index 1ab0673..93511d9 100644
--- a/gnulib-local/m4/termcap.m4
+++ b/gnulib-local/m4/termcap.m4
@@ -1,5 +1,5 @@
 # termcap.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006, 2008, 2015 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2006, 2008, 2015-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gnulib-local/m4/terminfo.m4 b/gnulib-local/m4/terminfo.m4
index 070e86e..8257e25 100644
--- a/gnulib-local/m4/terminfo.m4
+++ b/gnulib-local/m4/terminfo.m4
@@ -1,5 +1,5 @@
 # terminfo.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006, 2008, 2015 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2006, 2008, 2015-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/gnulib-local/m4/unionwait.m4 b/gnulib-local/m4/unionwait.m4
index 4ec7bf3..95199f3 100644
--- a/gnulib-local/m4/unionwait.m4
+++ b/gnulib-local/m4/unionwait.m4
@@ -1,5 +1,5 @@
 # unionwait.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1993-2002, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1993-2002, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
index 3ccc6fc..4b584da 100644
--- a/m4/fixautomake.m4
+++ b/m4/fixautomake.m4
@@ -1,5 +1,5 @@
 # fixautomake.m4 serial 8 (gettext-0.18)
-dnl Copyright (C) 2002-2003, 2006, 2009, 2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006, 2009, 2015-2016 Free Software Foundation,
 dnl Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
diff --git a/m4/woe32-dll.m4 b/m4/woe32-dll.m4
index ac92058..a25f5ac 100644
--- a/m4/woe32-dll.m4
+++ b/m4/woe32-dll.m4
@@ -1,5 +1,5 @@
 # woe32-dll.m4 serial 3
-dnl Copyright (C) 2005-2006, 2011, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2011, 2015-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/windows/gettext.rc b/windows/gettext.rc
index d105b63..3d70594 100644
--- a/windows/gettext.rc
+++ b/windows/gettext.rc
@@ -24,7 +24,7 @@ BEGIN
             VALUE "FileDescription", "GPLed program for Windows NT/2000/XP/Vista/7 and Windows 95/98/ME\0"
             VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
             VALUE "InternalName", "*.exe\0"
-            VALUE "LegalCopyright", "Copyright (C) 1995-2013\0"
+            VALUE "LegalCopyright", "Copyright (C) 1995-2016\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "*.exe\0"
             VALUE "ProductName", "gettext utilities\0"